Merge cherrypicks of ['googleplex-android-review.googlesource.com/24199511'] into udc-release.android-security-14.0.0_r9android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-release

Change-Id: I31cebc92fe6a0b1685a44d0dd56030af534b6d3d

1 files changed, 5 insertions, 0 deletions

diff --git a/service/src/com/android/car/CarPropertyService.java b/service/src/com/android/car/CarPropertyService.java
index e9db5adc5a..d9f89db6aa 100644
--- a/service/src/com/android/car/CarPropertyService.java
+++ b/service/src/com/android/car/CarPropertyService.java
@@ -943,6 +943,11 @@ public class CarPropertyService extends ICarProperty.Stub
                     Car.PERMISSION_READ_DISPLAY_UNITS);
             return;
         }
+        if (propertyId == VehiclePropertyIds.EV_CHARGE_SWITCH) {
+            CarServiceUtils.assertAnyPermission(mContext, readPermission,
+                    Car.PERMISSION_CONTROL_CAR_ENERGY);
+            return;
+        }
         CarServiceUtils.assertPermission(mContext, readPermission);
     }