summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai2018-04-10 17:08:30 -0500
committerKai2018-04-10 19:29:33 -0500
commit15362ff50758d2eaba4bcec11a89ee7d4f23f56e (patch)
tree07a2931767457baf0c864cd940ae75083587a10e /car-support-lib
parent46505531860c78bb8721cffad5c0f7a0809f696d (diff)
downloadplatform-packages-services-car-15362ff50758d2eaba4bcec11a89ee7d4f23f56e.tar.gz
platform-packages-services-car-15362ff50758d2eaba4bcec11a89ee7d4f23f56e.tar.xz
platform-packages-services-car-15362ff50758d2eaba4bcec11a89ee7d4f23f56e.zip
Cleanup after change Vehicle permission
Cleanup after change Vehicle permission. Bug: 77860745 Test: Compiles and flash into Owl Change-Id: I6e189b7d98722cb54fc7afd624335635a7b844e5
Diffstat (limited to 'car-support-lib')
-rw-r--r--car-support-lib/src/android/support/car/Car.java4
-rw-r--r--car-support-lib/src/android/support/car/hardware/CarSensorManager.java8
2 files changed, 6 insertions, 6 deletions
diff --git a/car-support-lib/src/android/support/car/Car.java b/car-support-lib/src/android/support/car/Car.java
index 3cd52206..c12b13c9 100644
--- a/car-support-lib/src/android/support/car/Car.java
+++ b/car-support-lib/src/android/support/car/Car.java
@@ -170,10 +170,10 @@ public class Car {
170 */ 170 */
171 public static final String PERMISSION_MILEAGE = "android.car.permission.CAR_MILEAGE"; 171 public static final String PERMISSION_MILEAGE = "android.car.permission.CAR_MILEAGE";
172 /** 172 /**
173 * Permission necessary to access car fuel level. 173 * Permission necessary to access car's energy information.
174 * @hide 174 * @hide
175 */ 175 */
176 public static final String PERMISSION_FUEL = "android.car.permission.CAR_FUEL"; 176 public static final String PERMISSION_ENERGY = "android.car.permission.CAR_ENERGY";
177 /** 177 /**
178 * Permission necessary to access car speed. 178 * Permission necessary to access car speed.
179 * @hide 179 * @hide
diff --git a/car-support-lib/src/android/support/car/hardware/CarSensorManager.java b/car-support-lib/src/android/support/car/hardware/CarSensorManager.java
index 3cbdc49e..9c134783 100644
--- a/car-support-lib/src/android/support/car/hardware/CarSensorManager.java
+++ b/car-support-lib/src/android/support/car/hardware/CarSensorManager.java
@@ -59,7 +59,7 @@ public abstract class CarSensorManager implements CarManagerBase {
59 public static final int SENSOR_TYPE_ODOMETER = 4; 59 public static final int SENSOR_TYPE_ODOMETER = 4;
60 /** 60 /**
61 * Represent the fuel level of the car. In {@link CarSensorEvent}, represents fuel level in 61 * Represent the fuel level of the car. In {@link CarSensorEvent}, represents fuel level in
62 * milliliters. Requires {@link Car#PERMISSION_FUEL} permission. 62 * milliliters. Requires {@link Car#PERMISSION_ENERGY} permission.
63 * @hide 63 * @hide
64 */ 64 */
65 public static final int SENSOR_TYPE_FUEL_LEVEL = 5; 65 public static final int SENSOR_TYPE_FUEL_LEVEL = 5;
@@ -148,7 +148,7 @@ public abstract class CarSensorManager implements CarManagerBase {
148 /** 148 /**
149 * Indicates battery level of the car. 149 * Indicates battery level of the car.
150 * In {@link CarSensorEvent}, represents battery level in WH. 150 * In {@link CarSensorEvent}, represents battery level in WH.
151 * This requires {@link Car#PERMISSION_FUEL} permission. 151 * This requires {@link Car#PERMISSION_ENERGY} permission.
152 */ 152 */
153 public static final int SENSOR_TYPE_EV_BATTERY_LEVEL = 28; 153 public static final int SENSOR_TYPE_EV_BATTERY_LEVEL = 28;
154 /** 154 /**
@@ -161,7 +161,7 @@ public abstract class CarSensorManager implements CarManagerBase {
161 public static final int SENSOR_TYPE_EV_CHARGE_PORT_CONNECTED = 30; 161 public static final int SENSOR_TYPE_EV_CHARGE_PORT_CONNECTED = 30;
162 /** 162 /**
163 * Indicates the instantaneous battery charging rate in mW. 163 * Indicates the instantaneous battery charging rate in mW.
164 * This requires {@link Car#PERMISSION_FUEL} permission. 164 * This requires {@link Car#PERMISSION_ENERGY} permission.
165 */ 165 */
166 public static final int SENSOR_TYPE_EV_BATTERY_CHARGE_RATE = 31; 166 public static final int SENSOR_TYPE_EV_BATTERY_CHARGE_RATE = 31;
167 /** 167 /**
@@ -284,7 +284,7 @@ public abstract class CarSensorManager implements CarManagerBase {
284 * @throws SecurityException if missing the appropriate permission. 284 * @throws SecurityException if missing the appropriate permission.
285 */ 285 */
286 @RequiresPermission(anyOf={Manifest.permission.ACCESS_FINE_LOCATION, Car.PERMISSION_SPEED, 286 @RequiresPermission(anyOf={Manifest.permission.ACCESS_FINE_LOCATION, Car.PERMISSION_SPEED,
287 Car.PERMISSION_MILEAGE, Car.PERMISSION_FUEL, Car.PERMISSION_VEHICLE_DYNAMICS_STATE}, 287 Car.PERMISSION_MILEAGE, Car.PERMISSION_ENERGY, Car.PERMISSION_VEHICLE_DYNAMICS_STATE},
288 conditional=true) 288 conditional=true)
289 public abstract boolean addListener(OnSensorChangedListener listener, 289 public abstract boolean addListener(OnSensorChangedListener listener,
290 @SensorType int sensorType, @SensorRate int rate) 290 @SensorType int sensorType, @SensorRate int rate)