diff options
| author | Xin Li <delphij@google.com> | 2020-12-02 00:38:58 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-12-02 00:38:58 -0800 |
| commit | d31ee388115d17c2fd337f2806b37390c7d29834 (patch) | |
| tree | de02b2ac289fbc2077fbc652481672eeea0b18fe /data | |
| parent | 88f10e63bb2ce069bffc195acee09c332aab71fd (diff) | |
| parent | 07ec9b4dcb828de0f9ad15ef5c501fcc5ce21379 (diff) | |
Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
Bug: 172690556
Merged-In: I78222391b83a4add8e964340ec08bb8a1306e1c6
Change-Id: I28bbf40820674675ccf765c912aa8140d3f74ab2
Diffstat (limited to 'data')
| -rw-r--r-- | data/etc/com.android.systemui.xml | 2 | ||||
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 4 | ||||
| -rw-r--r-- | data/sounds/effects/ChargingStarted.ogg | bin | 33370 -> 33162 bytes | |||
| -rw-r--r-- | data/sounds/effects/ogg/ChargingStarted.ogg | bin | 33370 -> 33162 bytes | |||
| -rw-r--r-- | data/sounds/effects/ogg/ChargingStarted_48k.ogg | bin | 33370 -> 33162 bytes |
5 files changed, 6 insertions, 0 deletions
diff --git a/data/etc/com.android.systemui.xml b/data/etc/com.android.systemui.xml index a5a2221e5532..06f1dae30cd3 100644 --- a/data/etc/com.android.systemui.xml +++ b/data/etc/com.android.systemui.xml @@ -35,10 +35,12 @@ <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"/> <permission name="android.permission.OBSERVE_NETWORK_POLICY"/> + <permission name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS" /> <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/> <permission name="android.permission.PACKAGE_USAGE_STATS" /> <permission name="android.permission.READ_DREAM_STATE"/> diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index ce6deeab87fa..6555fe93c81f 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -143,6 +143,10 @@ applications that come with the platform <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" /> <permission name="android.permission.PACKAGE_USAGE_STATS" /> <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" /> + <permission name="android.permission.MODIFY_AUDIO_ROUTING" /> + + <!-- For permission hub 2 debugging only --> + <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/> </privapp-permissions> <privapp-permissions package="com.android.phone"> diff --git a/data/sounds/effects/ChargingStarted.ogg b/data/sounds/effects/ChargingStarted.ogg Binary files differindex f09e273ea5ac..9526b08d9b3c 100644 --- a/data/sounds/effects/ChargingStarted.ogg +++ b/data/sounds/effects/ChargingStarted.ogg diff --git a/data/sounds/effects/ogg/ChargingStarted.ogg b/data/sounds/effects/ogg/ChargingStarted.ogg Binary files differindex f09e273ea5ac..9526b08d9b3c 100644 --- a/data/sounds/effects/ogg/ChargingStarted.ogg +++ b/data/sounds/effects/ogg/ChargingStarted.ogg diff --git a/data/sounds/effects/ogg/ChargingStarted_48k.ogg b/data/sounds/effects/ogg/ChargingStarted_48k.ogg Binary files differindex f09e273ea5ac..9526b08d9b3c 100644 --- a/data/sounds/effects/ogg/ChargingStarted_48k.ogg +++ b/data/sounds/effects/ogg/ChargingStarted_48k.ogg |