Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove car permissions from common shell package" into rvc-qpr-dev

Browse Source
This commit is contained in:
Agatha Man
2020-08-14 18:44:47 +00:00
committed by Android (Google) Code Review
parent d91bcb9dbf 39bcfc7c83
commit d029933aa5
2 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
data/etc/privapp-permissions-platform.xml
View File

@@ -431,18 +431,6 @@ applications that come with the platform
<permission name="android.permission.CAPTURE_AUDIO_OUTPUT" /> <permission name="android.permission.CAPTURE_AUDIO_OUTPUT" />
<!-- Permissions required for CTS test - AdbManagerTest --> <!-- Permissions required for CTS test - AdbManagerTest -->
<permission name="android.permission.MANAGE_DEBUGGING" /> <permission name="android.permission.MANAGE_DEBUGGING" />
<!-- Permissions required for ATS tests - AtsCarHostTestCases, AtsCarDeviceApp -->
<permission name="android.car.permission.CAR_DRIVING_STATE" />
<!-- Permissions required for ATS tests - AtsDeviceInfo, AtsAudioDeviceTestCases -->
<permission name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME" />
<!-- Permissions required for ATS tests - AtsDeviceInfo -->
<permission name="android.car.permission.CAR_DIAGNOSTICS" />
<!-- Permissions required for ATS tests - AtsDeviceInfo -->
<permission name="android.car.permission.CLEAR_CAR_DIAGNOSTICS" />
<!-- Permissions required for ATS tests - AtsCarHostTestCases -->
<permission name="android.car.permission.CONTROL_APP_BLOCKING" />
<!-- Permissions required for ATS tests - AtsCarHostTestCases -->
<permission name="android.car.permission.CAR_UX_RESTRICTIONS_CONFIGURATION" />
</privapp-permissions> </privapp-permissions>
<privapp-permissions package="com.android.statementservice"> <privapp-permissions package="com.android.statementservice">

13
packages/Shell/AndroidManifest.xml
View File

@@ -317,19 +317,6 @@
<!-- Permissions required for CTS test - AdbManagerTest --> <!-- Permissions required for CTS test - AdbManagerTest -->
<uses-permission android:name="android.permission.MANAGE_DEBUGGING" /> <uses-permission android:name="android.permission.MANAGE_DEBUGGING" />
<!-- Permissions required for ATS tests - AtsCarHostTestCases, AtsCarDeviceApp -->
<uses-permission android:name="android.car.permission.CAR_DRIVING_STATE" />
<!-- Permissions required for ATS tests - AtsDeviceInfo, AtsAudioDeviceTestCases -->
<uses-permission android:name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME" />
<!-- Permissions required for ATS tests - AtsDeviceInfo -->
<uses-permission android:name="android.car.permission.CAR_DIAGNOSTICS" />
<!-- Permissions required for ATS tests - AtsDeviceInfo -->
<uses-permission android:name="android.car.permission.CLEAR_CAR_DIAGNOSTICS" />
<!-- Permissions required for ATS tests - AtsCarHostTestCases -->
<uses-permission android:name="android.car.permission.CONTROL_APP_BLOCKING" />
<!-- Permissions required for ATS tests - AtsCarHostTestCases -->
<uses-permission android:name="android.car.permission.CAR_UX_RESTRICTIONS_CONFIGURATION" />
<application android:label="@string/app_label" <application android:label="@string/app_label"
android:theme="@android:style/Theme.DeviceDefault.DayNight" android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:defaultToDeviceProtectedStorage="true" android:defaultToDeviceProtectedStorage="true"