Remove VehiclePermissionModel from Car Service

It's not used

Bug: b/33670724

Test: removing unused feature
Change-Id: Ie7fa97f0c699bf80bdf1d505e0cd8988cdb2a4cc

3 files changed, 3 insertions, 15 deletions

diff --git a/service/src/com/android/car/hal/VehicleHal.java b/service/src/com/android/car/hal/VehicleHal.java
index 7e3dea449b..2f834ce17e 100644
--- a/service/src/com/android/car/hal/VehicleHal.java
+++ b/service/src/com/android/car/hal/VehicleHal.java
@@ -229,8 +229,8 @@ public class VehicleHal extends IVehicleCallback.Stub {
         }
 
         if (config == null) {
-            throw new IllegalArgumentException("subscribe error: config is null for property " +
-                    property);
+            throw new IllegalArgumentException("subscribe error: config is null for property 0x" +
+                    toHexString(property));
         } else if (isPropertySubscribable(config)) {
             synchronized (this) {
                 assertServiceOwnerLocked(service, property);
@@ -415,7 +415,6 @@ public class VehicleHal extends IVehicleCallback.Stub {
                     .append("Property:0x").append(toHexString(config.prop))
                     .append(",access:0x").append(toHexString(config.access))
                     .append(",changeMode:0x").append(toHexString(config.changeMode))
-                    .append(",permission:0x").append(toHexString(config.permissionModel))
                     .append(",areas:0x").append(toHexString(config.supportedAreas))
                     .append(",config:0x").append(Arrays.toString(config.configArray.toArray()))
                     .append(",fs min:").append(config.minSampleRate)
diff --git a/tests/carservice_test/src/com/android/car/test/AudioRoutingPolicyTest.java b/tests/carservice_test/src/com/android/car/test/AudioRoutingPolicyTest.java
index fa8c1498f4..b4c17d311e 100644
--- a/tests/carservice_test/src/com/android/car/test/AudioRoutingPolicyTest.java
+++ b/tests/carservice_test/src/com/android/car/test/AudioRoutingPolicyTest.java
@@ -17,7 +17,6 @@ package com.android.car.test;
 
 import android.hardware.vehicle.V2_0.VehicleAudioContextFlag;
 import android.hardware.vehicle.V2_0.VehicleAudioRoutingPolicyIndex;
-import android.hardware.vehicle.V2_0.VehiclePermissionModel;
 import android.hardware.vehicle.V2_0.VehiclePropValue;
 import android.hardware.vehicle.V2_0.VehicleProperty;
 import android.hardware.vehicle.V2_0.VehiclePropertyAccess;
@@ -60,8 +59,7 @@ public class AudioRoutingPolicyTest extends MockedCarTestBase {
     @Override
     protected synchronized void configureMockedHal() {
         addProperty(VehicleProperty.AUDIO_ROUTING_POLICY, mAudioRoutingPolicyHandler)
-                .setAccess(VehiclePropertyAccess.WRITE)
-                .setPermissionModel(VehiclePermissionModel.SYSTEM_APP_ONLY);
+                .setAccess(VehiclePropertyAccess.WRITE);
     }
 
     public void testNoHwVariant() throws Exception {
diff --git a/vehicle-hal-support-lib/src/com/android/car/vehiclehal/test/VehiclePropConfigBuilder.java b/vehicle-hal-support-lib/src/com/android/car/vehiclehal/test/VehiclePropConfigBuilder.java
index c801067e64..8ff9603400 100644
--- a/vehicle-hal-support-lib/src/com/android/car/vehiclehal/test/VehiclePropConfigBuilder.java
+++ b/vehicle-hal-support-lib/src/com/android/car/vehiclehal/test/VehiclePropConfigBuilder.java
@@ -18,7 +18,6 @@ package com.android.car.vehiclehal.test;
 
 import android.annotation.CheckResult;
 import android.hardware.vehicle.V2_0.VehicleAreaConfig;
-import android.hardware.vehicle.V2_0.VehiclePermissionModel;
 import android.hardware.vehicle.V2_0.VehiclePropConfig;
 import android.hardware.vehicle.V2_0.VehiclePropertyAccess;
 import android.hardware.vehicle.V2_0.VehiclePropertyChangeMode;
@@ -42,7 +41,6 @@ public class VehiclePropConfigBuilder {
         mConfig.prop = propId;
         mConfig.access = VehiclePropertyAccess.READ_WRITE;
         mConfig.changeMode = VehiclePropertyChangeMode.ON_CHANGE;
-        mConfig.permissionModel = VehiclePermissionModel.NO_RESTRICTION;
     }
 
     private VehiclePropConfig clone(VehiclePropConfig propConfig) {
@@ -51,7 +49,6 @@ public class VehiclePropConfigBuilder {
         newConfig.prop = propConfig.prop;
         newConfig.access = propConfig.access;
         newConfig.changeMode = propConfig.changeMode;
-        newConfig.permissionModel = propConfig.permissionModel;
         newConfig.supportedAreas = propConfig.supportedAreas;
         newConfig.configFlags = propConfig.configFlags;
         newConfig.configString = propConfig.configString;
@@ -86,12 +83,6 @@ public class VehiclePropConfigBuilder {
     }
 
     @CheckResult
-    public VehiclePropConfigBuilder setPermissionModel(int permissionModel) {
-        mConfig.permissionModel = permissionModel;
-        return this;
-    }
-
-    @CheckResult
     public VehiclePropConfigBuilder setSupportedAreas(int supportedAreas) {
         mConfig.supportedAreas = supportedAreas;
         return this;