Customize permissions for vendor property
Add a new property, vendors can use the configArray in the property
to chose permission for each vendor property.
Add testCase into CarPropertyTest
Bug: 109950289
Test: flash HU with google vhal and run vts
Change-Id: I40c22d35008d576a04807fd3df100a3422d3b5ff
diff --git a/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml b/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml
index e034f36..4031032 100644
--- a/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml
+++ b/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml
@@ -78,7 +78,11 @@
<uses-permission android:name="android.permission.SET_ACTIVITY_WATCHER"/>
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
<uses-permission android:name="android.permission.WRITE_SETTINGS"/>
-
+ <!-- use for vendor properties -->
+ <uses-permission android:name="android.car.permission.CAR_VENDOR_EXTENSION" />
+ <uses-permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_SEAT" />
+ <uses-permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_INFO" />
+ <uses-permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_INFO" />
<application android:label="@string/app_title"
android:icon="@drawable/ic_launcher">
<uses-library android:name="android.test.runner"/>
diff --git a/tests/carservice_unit_test/src/com/android/car/hal/PropertyHalServiceIdsTest.java b/tests/carservice_unit_test/src/com/android/car/hal/PropertyHalServiceIdsTest.java
new file mode 100644
index 0000000..a6dd386
--- /dev/null
+++ b/tests/carservice_unit_test/src/com/android/car/hal/PropertyHalServiceIdsTest.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.car.hal;
+
+import android.car.Car;
+import android.car.VehiclePropertyIds;
+import android.hardware.automotive.vehicle.V2_0.VehicleVendorPermission;
+import android.util.Log;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class PropertyHalServiceIdsTest {
+ @Rule
+ public MockitoRule mMockitoRule = MockitoJUnit.rule();
+
+ private PropertyHalServiceIds mPropertyHalServiceIds;
+
+ private static final String TAG = PropertyHalServiceIdsTest.class.getSimpleName();
+ private static final int VENDOR_PROPERTY_1 = 0x21e01111;
+ private static final int VENDOR_PROPERTY_2 = 0x21e01112;
+ private static final int VENDOR_PROPERTY_3 = 0x21e01113;
+ private static final int VENDOR_PROPERTY_4 = 0x21e01114;
+ private static final int[] VENDOR_PROPERTY_IDS = {
+ VENDOR_PROPERTY_1, VENDOR_PROPERTY_2, VENDOR_PROPERTY_3, VENDOR_PROPERTY_4};
+ private static final int[] SYSTEM_PROPERTY_IDS = {VehiclePropertyIds.ENGINE_OIL_LEVEL,
+ VehiclePropertyIds.CURRENT_GEAR, VehiclePropertyIds.NIGHT_MODE,
+ VehiclePropertyIds.HVAC_FAN_SPEED, VehiclePropertyIds.DOOR_LOCK};
+ private static final List<Integer> CONFIG_ARRAY = new ArrayList<>();
+ private static final List<Integer> CONFIG_ARRAY_INVALID = new ArrayList<>();
+ @Before
+ public void setUp() {
+ mPropertyHalServiceIds = new PropertyHalServiceIds();
+ // set up read permission and write permission to VENDOR_PROPERTY_1
+ CONFIG_ARRAY.add(VENDOR_PROPERTY_1);
+ CONFIG_ARRAY.add(VehicleVendorPermission.PERMISSION_DEFAULT);
+ CONFIG_ARRAY.add(VehicleVendorPermission.PERMISSION_NOT_ACCESSIBLE);
+ // set up read permission and write permission to VENDOR_PROPERTY_2
+ CONFIG_ARRAY.add(VENDOR_PROPERTY_2);
+ CONFIG_ARRAY.add(VehicleVendorPermission.PERMISSION_GET_VENDOR_CATEGORY_ENGINE);
+ CONFIG_ARRAY.add(VehicleVendorPermission.PERMISSION_SET_VENDOR_CATEGORY_ENGINE);
+ // set up read permission and write permission to VENDOR_PROPERTY_3
+ CONFIG_ARRAY.add(VENDOR_PROPERTY_3);
+ CONFIG_ARRAY.add(VehicleVendorPermission.PERMISSION_GET_VENDOR_CATEGORY_INFO);
+ CONFIG_ARRAY.add(VehicleVendorPermission.PERMISSION_DEFAULT);
+
+ // set a invalid config
+ CONFIG_ARRAY_INVALID.add(VehiclePropertyIds.CURRENT_GEAR);
+ CONFIG_ARRAY_INVALID.add(VehicleVendorPermission.PERMISSION_GET_VENDOR_CATEGORY_ENGINE);
+ CONFIG_ARRAY_INVALID.add(VehicleVendorPermission.PERMISSION_SET_VENDOR_CATEGORY_ENGINE);
+ }
+
+ /**
+ * Test {@link PropertyHalServiceIds#getReadPermission(int)}
+ * and {@link PropertyHalServiceIds#getWritePermission(int)} for system properties
+ */
+ @Test
+ public void checkPermissionForSystemProperty() {
+ Assert.assertEquals(Car.PERMISSION_CAR_ENGINE_DETAILED,
+ mPropertyHalServiceIds.getReadPermission(VehiclePropertyIds.ENGINE_OIL_LEVEL));
+ Assert.assertNull(
+ mPropertyHalServiceIds.getWritePermission(VehiclePropertyIds.ENGINE_OIL_LEVEL));
+ Assert.assertEquals(Car.PERMISSION_CONTROL_CAR_CLIMATE,
+ mPropertyHalServiceIds.getReadPermission(VehiclePropertyIds.HVAC_FAN_SPEED));
+ Assert.assertEquals(Car.PERMISSION_CONTROL_CAR_CLIMATE,
+ mPropertyHalServiceIds.getWritePermission(VehiclePropertyIds.HVAC_FAN_SPEED));
+ }
+
+ /**
+ * Test {@link PropertyHalServiceIds#customizeVendorPermission(List)}
+ */
+ @Test
+ public void checkPermissionForVendorProperty() {
+ for (int propId : VENDOR_PROPERTY_IDS) {
+ mPropertyHalServiceIds.insertVendorProperty(propId);
+ }
+ // test insert a valid config
+ mPropertyHalServiceIds.customizeVendorPermission(CONFIG_ARRAY);
+
+ Assert.assertEquals(Car.PERMISSION_VENDOR_EXTENSION,
+ mPropertyHalServiceIds.getReadPermission(VENDOR_PROPERTY_1));
+ Assert.assertNull(mPropertyHalServiceIds.getWritePermission(VENDOR_PROPERTY_1));
+
+ Assert.assertEquals(android.car.hardware.property
+ .VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_ENGINE,
+ mPropertyHalServiceIds.getReadPermission(VENDOR_PROPERTY_2));
+ Assert.assertEquals(android.car.hardware.property
+ .VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_ENGINE,
+ mPropertyHalServiceIds.getWritePermission(VENDOR_PROPERTY_2));
+
+ Assert.assertEquals(android.car.hardware.property
+ .VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_INFO,
+ mPropertyHalServiceIds.getReadPermission(VENDOR_PROPERTY_3));
+ Assert.assertEquals(Car.PERMISSION_VENDOR_EXTENSION,
+ mPropertyHalServiceIds.getWritePermission(VENDOR_PROPERTY_3));
+
+ Assert.assertEquals(Car.PERMISSION_VENDOR_EXTENSION,
+ mPropertyHalServiceIds.getReadPermission(VENDOR_PROPERTY_4));
+ Assert.assertEquals(Car.PERMISSION_VENDOR_EXTENSION,
+ mPropertyHalServiceIds.getWritePermission(VENDOR_PROPERTY_4));
+
+ // test insert invalid config
+ try {
+ mPropertyHalServiceIds.customizeVendorPermission(CONFIG_ARRAY_INVALID);
+ Assert.fail("Insert system properties with vendor permissions");
+ } catch (IllegalArgumentException e) {
+ Log.v(TAG, e.getMessage());
+ }
+ }
+
+ /**
+ * Test {@link PropertyHalServiceIds#isSupportedProperty(int)}
+ */
+ @Test
+ public void checkVendorPropertyId() {
+ for (int vendorProp : VENDOR_PROPERTY_IDS) {
+ Assert.assertTrue(mPropertyHalServiceIds.isSupportedProperty(vendorProp));
+ }
+ for (int systemProp : SYSTEM_PROPERTY_IDS) {
+ Assert.assertTrue(mPropertyHalServiceIds.isSupportedProperty(systemProp));
+ }
+ }
+
+}
diff --git a/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/CarPropertyTest.java b/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/CarPropertyTest.java
index 9d638ba..8e41c19 100644
--- a/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/CarPropertyTest.java
+++ b/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/CarPropertyTest.java
@@ -28,6 +28,8 @@
import android.car.hardware.CarPropertyValue;
import android.car.hardware.property.CarPropertyManager;
import android.car.hardware.property.CarPropertyManager.CarPropertyEventCallback;
+import android.car.hardware.property.VehicleVendorPermission;
+import android.hardware.automotive.vehicle.V2_0.VehiclePropertyGroup;
import android.os.SystemClock;
import android.util.ArraySet;
import android.util.Log;
@@ -41,7 +43,9 @@
import java.time.Duration;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
/**
* The test suite will execute end-to-end Car Property API test by generating VHAL property data
@@ -73,6 +77,55 @@
private static final String CAR_PROPERTY_TEST_JSON = "car_property_test.json";
private static final int GEAR_PROPERTY_ID = 289408000;
+ private static final Set<String> VENDOR_PERMISSIONS = new HashSet<>(Arrays.asList(
+ Car.PERMISSION_VENDOR_EXTENSION,
+ VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_WINDOW,
+ VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_WINDOW,
+ // permissions for the property related with door
+ VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_DOOR,
+ VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_DOOR,
+ // permissions for the property related with seat
+ VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_SEAT,
+ VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_SEAT,
+ // permissions for the property related with mirror
+ VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_MIRROR,
+ VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_MIRROR,
+
+ // permissions for the property related with car's information
+ VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_INFO,
+ VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_INFO,
+ // permissions for the property related with car's engine
+ VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_ENGINE,
+ VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_ENGINE,
+ // permissions for the property related with car's HVAC
+ VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_HVAC,
+ VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_HVAC,
+ // permissions for the property related with car's light
+ VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_LIGHT,
+ VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_LIGHT,
+
+ // permissions reserved for other vendor permission
+ VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_1,
+ VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_1,
+ VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_2,
+ VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_2,
+ VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_3,
+ VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_3,
+ VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_4,
+ VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_4,
+ VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_5,
+ VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_5,
+ VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_6,
+ VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_6,
+ VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_7,
+ VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_7,
+ VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_8,
+ VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_8,
+ VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_9,
+ VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_9,
+ VehicleVendorPermission.PERMISSION_SET_CAR_VENDOR_CATEGORY_10,
+ VehicleVendorPermission.PERMISSION_GET_CAR_VENDOR_CATEGORY_10
+ ));
private class CarPropertyEventReceiver implements CarPropertyEventCallback {
private VhalEventVerifier mVerifier;
@@ -228,6 +281,30 @@
assertEquals(16, currentGear);
}
+ /**
+ * Check only vendor properties have vendor permissions.
+ */
+ @Test
+ public void checkPropertyPermission() {
+ CarPropertyManager propMgr = (CarPropertyManager) mCar.getCarManager(Car.PROPERTY_SERVICE);
+ List<CarPropertyConfig> configs = propMgr.getPropertyList();
+ for (CarPropertyConfig cfg : configs) {
+ String readPermission = propMgr.getReadPermission(cfg.getPropertyId());
+ String writePermission = propMgr.getWritePermission(cfg.getPropertyId());
+ if ((cfg.getPropertyId() & VehiclePropertyGroup.MASK) == VehiclePropertyGroup.VENDOR) {
+ Assert.assertTrue(readPermission == null
+ || VENDOR_PERMISSIONS.contains(readPermission));
+ Assert.assertTrue(writePermission == null
+ || VENDOR_PERMISSIONS.contains(writePermission));
+ } else {
+ Assert.assertTrue(readPermission == null
+ || !VENDOR_PERMISSIONS.contains(readPermission));
+ Assert.assertTrue(writePermission == null
+ || !VENDOR_PERMISSIONS.contains(writePermission));
+ }
+ }
+ }
+
private class GearEventTestCallback implements CarPropertyEventCallback {
private long mTimestamp = 0L;