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

Merge "Add android.permission.LAUNCH_CREDENTIAL_SELECTOR which is needed for GtsCredentialsTestCases" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-03 00:25:59 +00:00
committed by Android (Google) Code Review
parent d06a6b54c2 17d4054d61
commit e28675e2c7
2 changed files with 69 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -522,6 +522,8 @@ applications that come with the platform
<permission name="android.permission.SATELLITE_COMMUNICATION"/> <permission name="android.permission.SATELLITE_COMMUNICATION"/>
<!-- Permission required for GTS test - GtsAttestationVerificationDeviceSideTestCases --> <!-- Permission required for GTS test - GtsAttestationVerificationDeviceSideTestCases -->
<permission name="android.permission.USE_ATTESTATION_VERIFICATION_SERVICE" /> <permission name="android.permission.USE_ATTESTATION_VERIFICATION_SERVICE" />
<!-- Permission required for GTS test - GtsCredentialsTestCases -->
<permission name="android.permission.LAUNCH_CREDENTIAL_SELECTOR"/>
</privapp-permissions> </privapp-permissions>
<privapp-permissions package="com.android.statementservice"> <privapp-permissions package="com.android.statementservice">

12
packages/Shell/AndroidManifest.xml
View File

@@ -833,11 +833,13 @@
<uses-permission android:name="android.permission.WRITE_APN_SETTINGS" /> <uses-permission android:name="android.permission.WRITE_APN_SETTINGS" />
<uses-permission android:name="android.permission.LOG_FOREGROUND_RESOURCE_USE" /> <uses-permission android:name="android.permission.LOG_FOREGROUND_RESOURCE_USE" />
<!-- Permission required for GTS test - GtsAttestationVerificationDeviceSideTestCases --> <!-- Permission required for GTS test - GtsAttestationVerificationDeviceSideTestCases -->
<uses-permission android:name="android.permission.USE_ATTESTATION_VERIFICATION_SERVICE" /> <uses-permission android:name="android.permission.USE_ATTESTATION_VERIFICATION_SERVICE" />
<!-- Permission required for GTS test - GtsCredentialsTestCases -->
<uses-permission android:name="android.permission.LAUNCH_CREDENTIAL_SELECTOR" />
<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"
android:directBootAware="true"> android:directBootAware="true">
@@ -863,7 +865,8 @@
</intent-filter> </intent-filter>
</provider> </provider>
<provider android:name=".HeapDumpProvider" <provider
android:name=".HeapDumpProvider"
android:authorities="com.android.shell.heapdump" android:authorities="com.android.shell.heapdump"
android:grantUriPermissions="true" android:grantUriPermissions="true"
android:exported="false" /> android:exported="false" />
@@ -875,7 +878,8 @@
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:exported="false" /> android:exported="false" />
<activity android:name=".HeapDumpActivity" <activity
android:name=".HeapDumpActivity"
android:theme="@*android:style/Theme.Translucent.NoTitleBar" android:theme="@*android:style/Theme.Translucent.NoTitleBar"
android:label="@*android:string/dump_heap_title" android:label="@*android:string/dump_heap_title"
android:finishOnCloseSystemDialogs="true" android:finishOnCloseSystemDialogs="true"