commit 461ecc6c9bd22f782e8c64a6693bd8ec6d61593e
author Steve Paik <spaik@google.com> Wed Jun 08 15:28:32 2016 -0700
committer Steve Paik <spaik@google.com> Thu Jul 07 16:11:05 2016 -0700
tree 95ab3eedb80e344c5c60c0b5ae1a9a7e07b3ed29
parent e53147320558518a33a89ad702386e747fe8fb3e

Add CarGenericManager and refactor HVAC to use it

Change-Id: I0af862f8da2259069a5be0d17efb1f82a208fa76

service/src/com/android/car/ICarImpl.java

diff --git a/service/src/com/android/car/ICarImpl.java b/service/src/com/android/car/ICarImpl.java
index 7d34f2b..05e8f59 100644
--- a/service/src/com/android/car/ICarImpl.java
+++ b/service/src/com/android/car/ICarImpl.java
@@ -245,49 +245,32 @@
     }
 
     public static void assertVehicleHalMockPermission(Context context) {
-        if (context.checkCallingOrSelfPermission(Car.PERMISSION_MOCK_VEHICLE_HAL)
-                != PackageManager.PERMISSION_GRANTED) {
-            throw new SecurityException("requires CAR_MOCK_VEHICLE_HAL permission");
-        }
+        assertPermission(context, Car.PERMISSION_MOCK_VEHICLE_HAL);
     }
 
     public static void assertCameraPermission(Context context) {
-        if (context.checkCallingOrSelfPermission(Car.PERMISSION_CAR_CAMERA)
-                != PackageManager.PERMISSION_GRANTED) {
-            throw new SecurityException(
-                    "requires " + Car.PERMISSION_CAR_CAMERA);
-        }
+        assertPermission(context, Car.PERMISSION_CAR_CAMERA);
     }
 
     public static void assertNavigationManagerPermission(Context context) {
-        if (context.checkCallingOrSelfPermission(Car.PERMISSION_CAR_NAVIGATION_MANAGER)
-                != PackageManager.PERMISSION_GRANTED) {
-            throw new SecurityException(
-                    "requires " + Car.PERMISSION_CAR_NAVIGATION_MANAGER);
-        }
+        assertPermission(context, Car.PERMISSION_CAR_NAVIGATION_MANAGER);
     }
 
     public static void assertHvacPermission(Context context) {
-        if (context.checkCallingOrSelfPermission(Car.PERMISSION_CAR_HVAC)
-                != PackageManager.PERMISSION_GRANTED) {
-            throw new SecurityException(
-                    "requires " + Car.PERMISSION_CAR_HVAC);
-        }
+        assertPermission(context, Car.PERMISSION_CAR_HVAC);
     }
 
     private static void assertRadioPermission(Context context) {
-        if (context.checkCallingOrSelfPermission(Car.PERMISSION_CAR_RADIO)
-            != PackageManager.PERMISSION_GRANTED) {
-            throw new SecurityException(
-                "requires permission " + Car.PERMISSION_CAR_RADIO);
-        }
+        assertPermission(context, Car.PERMISSION_CAR_RADIO);
     }
 
     public static void assertProjectionPermission(Context context) {
-        if (context.checkCallingOrSelfPermission(Car.PERMISSION_CAR_PROJECTION)
-                != PackageManager.PERMISSION_GRANTED) {
-            throw new SecurityException(
-                    "requires " + Car.PERMISSION_CAR_PROJECTION);
+        assertPermission(context, Car.PERMISSION_CAR_PROJECTION);
+    }
+
+    public static void assertPermission(Context context, String permission) {
+        if (context.checkCallingOrSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) {
+            throw new SecurityException("requires " + permission);
         }
     }