diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/etc/platform.xml | 3 | ||||
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 10 | ||||
| -rw-r--r-- | data/sounds/effects/ChargingStarted.ogg | bin | 33162 -> 33370 bytes | |||
| -rw-r--r-- | data/sounds/effects/ogg/ChargingStarted.ogg | bin | 33162 -> 33370 bytes | |||
| -rw-r--r-- | data/sounds/effects/ogg/ChargingStarted_48k.ogg | bin | 33162 -> 33370 bytes |
5 files changed, 11 insertions, 2 deletions
diff --git a/data/etc/platform.xml b/data/etc/platform.xml index cf312165dd9a..5f159a1bab81 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -227,8 +227,7 @@ <library name="android.test.base" file="/system/framework/android.test.base.jar" /> <library name="android.test.mock" - file="/system/framework/android.test.mock.jar" - dependency="android.test.base" /> + file="/system/framework/android.test.mock.jar" /> <library name="android.test.runner" file="/system/framework/android.test.runner.jar" dependency="android.test.base:android.test.mock" /> diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index e6f4e27100de..419398df20eb 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -220,6 +220,7 @@ applications that come with the platform <permission name="android.permission.MANAGE_EXTERNAL_STORAGE"/> <permission name="android.permission.UPDATE_APP_OPS_STATS"/> <permission name="android.permission.UPDATE_DEVICE_STATS"/> + <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/> </privapp-permissions> <privapp-permissions package="com.android.providers.media.module"> @@ -427,12 +428,21 @@ applications that come with the platform <permission name="android.permission.CAPTURE_AUDIO_OUTPUT" /> <!-- Permissions required for CTS test - AdbManagerTest --> <permission name="android.permission.MANAGE_DEBUGGING" /> + <!-- Permissions required for CTS test - TimeManagerTest --> + <permission name="android.permission.MANAGE_TIME_AND_ZONE_DETECTION" /> </privapp-permissions> <privapp-permissions package="com.android.statementservice"> <permission name="android.permission.INTENT_FILTER_VERIFICATION_AGENT"/> </privapp-permissions> + <privapp-permissions package="com.android.traceur"> + <!-- Permissions required to receive BUGREPORT_STARTED intent --> + <permission name="android.permission.DUMP"/> + <!-- Permissions required for quick settings tile --> + <permission name="android.permission.STATUS_BAR"/> + </privapp-permissions> + <privapp-permissions package="com.android.tv"> <permission name="android.permission.CHANGE_HDMI_CEC_ACTIVE_SOURCE"/> <permission name="android.permission.DVB_DEVICE"/> diff --git a/data/sounds/effects/ChargingStarted.ogg b/data/sounds/effects/ChargingStarted.ogg Binary files differindex 9526b08d9b3c..f09e273ea5ac 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 9526b08d9b3c..f09e273ea5ac 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 9526b08d9b3c..f09e273ea5ac 100644 --- a/data/sounds/effects/ogg/ChargingStarted_48k.ogg +++ b/data/sounds/effects/ogg/ChargingStarted_48k.ogg |