diff options
| author | Eva Chen <evaschen@google.com> | 2022-01-27 23:05:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-01-27 23:05:29 +0000 |
| commit | 5a7844f9f2863d58a930dc3418c9c9be2032f613 (patch) | |
| tree | cd777c3e9f643263c6f94a3b086a3ff2fda2e680 | |
| parent | c3cab6fb8a716e624abeca92e7f3c4d1d6eadf4c (diff) | |
| parent | 543dfb155bc4bd97bea3cf5b5b8130662a98bad6 (diff) | |
| download | Car-5a7844f9f2863d58a930dc3418c9c9be2032f613.tar.gz | |
Merge "Update CarLocationService based on suggestions from API Council."
| -rw-r--r-- | data/etc/com.android.car.shell.xml | 1 | ||||
| -rw-r--r-- | data/etc/com.android.car.xml | 2 | ||||
| -rw-r--r-- | packages/CarShell/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | service-builtin/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | service/src/com/android/car/CarLocationService.java | 15 |
5 files changed, 14 insertions, 8 deletions
diff --git a/data/etc/com.android.car.shell.xml b/data/etc/com.android.car.shell.xml index 52914aefe0..6c3c03173f 100644 --- a/data/etc/com.android.car.shell.xml +++ b/data/etc/com.android.car.shell.xml @@ -19,6 +19,7 @@ is ok. --> <privapp-permissions package="com.android.shell"> <permission name="android.permission.ACCESS_VOICE_INTERACTION_SERVICE" /> + <permission name="android.permission.CONTROL_AUTOMOTIVE_GNSS"/> <permission name="android.permission.INSTALL_PACKAGES" /> <permission name="android.permission.MEDIA_CONTENT_CONTROL"/> <permission name="android.permission.MODIFY_AUDIO_ROUTING"/> diff --git a/data/etc/com.android.car.xml b/data/etc/com.android.car.xml index 93ebea8f66..9d1c2a2682 100644 --- a/data/etc/com.android.car.xml +++ b/data/etc/com.android.car.xml @@ -16,7 +16,7 @@ --> <permissions> <privapp-permissions package="com.android.car"> - <permission name="android.permission.AUTOMOTIVE_GNSS_CONTROLS"/> + <permission name="android.permission.CONTROL_AUTOMOTIVE_GNSS"/> <permission name="android.permission.LOCATION_HARDWARE"/> <permission name="android.permission.MANAGE_USERS"/> <permission name="android.permission.MODIFY_AUDIO_ROUTING"/> diff --git a/packages/CarShell/AndroidManifest.xml b/packages/CarShell/AndroidManifest.xml index e667f1070f..cf1062b5bd 100644 --- a/packages/CarShell/AndroidManifest.xml +++ b/packages/CarShell/AndroidManifest.xml @@ -33,6 +33,8 @@ <uses-permission android:name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME" /> <!-- Permission required for ATS tests - AtsCarTests#CarAudioManagerSystemTest --> <uses-permission android:name="android.car.permission.CAR_CONTROL_AUDIO_SETTINGS" /> + <!-- Permission required for 'adb shell cmd location is-automotive-gnss-suspended' --> + <uses-permission android:name="android.permission.CONTROL_AUTOMOTIVE_GNSS" /> <!-- Permission required for ATS tests - AtsCarTests#CarPropertyManagerTest--> <uses-permission android:name="android.car.permission.CONTROL_CAR_CLIMATE" /> <!-- Permission required for ATS tests - AtsCarTests#CarAudioManagerSystemTest --> diff --git a/service-builtin/AndroidManifest.xml b/service-builtin/AndroidManifest.xml index 2905824b42..f1447b812e 100644 --- a/service-builtin/AndroidManifest.xml +++ b/service-builtin/AndroidManifest.xml @@ -946,7 +946,7 @@ <uses-permission android:name="android.permission.MANAGE_USERS"/> <uses-permission android:name="android.permission.LOCATION_HARDWARE"/> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> - <uses-permission android:name="android.permission.AUTOMOTIVE_GNSS_CONTROLS"/> + <uses-permission android:name="android.permission.CONTROL_AUTOMOTIVE_GNSS"/> <uses-permission android:name="android.permission.PROVIDE_TRUST_AGENT"/> <uses-permission android:name="android.permission.READ_LOGS"/> <!-- Used by NotificationHelper to change the notifications app name --> diff --git a/service/src/com/android/car/CarLocationService.java b/service/src/com/android/car/CarLocationService.java index 4c105d34a6..de4aeb9339 100644 --- a/service/src/com/android/car/CarLocationService.java +++ b/service/src/com/android/car/CarLocationService.java @@ -145,16 +145,19 @@ public class CarLocationService extends BroadcastReceiver implements CarServiceB accumulatedPolicy.isComponentEnabled(PowerComponent.LOCATION); if (isOn) { logd("Resume GNSS requests."); - locationManager.setAutoGnssSuspended(false); - if (locationManager.isAutoGnssSuspended()) { + locationManager.setAutomotiveGnssSuspended(false); + if (locationManager.isAutomotiveGnssSuspended()) { Slogf.w(TAG, - "isAutoGnssSuspended is true. GNSS should NOT be suspended."); + "Failed - isAutomotiveGnssSuspended is true. " + + "GNSS should NOT be suspended."); } } else { logd("Suspend GNSS requests."); - locationManager.setAutoGnssSuspended(true); - if (!locationManager.isAutoGnssSuspended()) { - Slogf.w(TAG, "isAutoGnssSuspended is false. GNSS should be suspended."); + locationManager.setAutomotiveGnssSuspended(true); + if (!locationManager.isAutomotiveGnssSuspended()) { + Slogf.w(TAG, + "Failed - isAutomotiveGnssSuspended is false. " + + "GNSS should be suspended."); } } } |