diff options
| author | Fabian Kozynski <kozynski@google.com> | 2020-08-17 19:01:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-17 19:01:48 +0000 |
| commit | a7149e7a53eee4e0f0cfd5297f41caa4ac32b986 (patch) | |
| tree | 4461b8d1a58dee68be78374c66faa867f4429f9e | |
| parent | 88aebd1fb15046c5ce049b5046465ab5bf7130eb (diff) | |
| parent | d951edaa48002013c73ea05c7a419f18a2dcdcbb (diff) | |
Merge "Add MODIFY_AUDIO_ROUTING permission to systemui" into rvc-qpr-dev am: d951edaa48
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12378082
Change-Id: I2d29f6eec37ad75c83fd8e96351061116929a54a
| -rw-r--r-- | data/etc/com.android.systemui.xml | 1 | ||||
| -rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/data/etc/com.android.systemui.xml b/data/etc/com.android.systemui.xml index ada8b000a26b..06f1dae30cd3 100644 --- a/data/etc/com.android.systemui.xml +++ b/data/etc/com.android.systemui.xml @@ -35,6 +35,7 @@ <permission name="android.permission.MANAGE_USERS"/> <permission name="android.permission.MASTER_CLEAR"/> <permission name="android.permission.MEDIA_CONTENT_CONTROL"/> + <permission name="android.permission.MODIFY_AUDIO_ROUTING" /> <permission name="android.permission.MODIFY_DAY_NIGHT_MODE"/> <permission name="android.permission.MODIFY_PHONE_STATE"/> <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/> diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 667433c46e50..7b8aba451e27 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -240,6 +240,8 @@ <!-- Listen app op changes --> <uses-permission android:name="android.permission.WATCH_APPOPS" /> <uses-permission android:name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS" /> + <!-- For handling silent audio recordings --> + <uses-permission android:name="android.permission.MODIFY_AUDIO_ROUTING" /> <!-- to read and change hvac values in a car --> <uses-permission android:name="android.car.permission.CONTROL_CAR_CLIMATE" /> @@ -267,6 +269,7 @@ <!-- Permission to make accessibility service access Bubbles --> <uses-permission android:name="android.permission.ADD_TRUSTED_DISPLAY" /> + <protected-broadcast android:name="com.android.settingslib.action.REGISTER_SLICE_RECEIVER" /> <protected-broadcast android:name="com.android.settingslib.action.UNREGISTER_SLICE_RECEIVER" /> <protected-broadcast android:name="com.android.settings.flashlight.action.FLASHLIGHT_CHANGED" /> |