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 am: e28675e2c7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22938400

Change-Id: I5b8a19f4d513f83efc0e38b7687af7864a52f5fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-03 01:15:28 +00:00
committed by Automerger Merge Worker
parent 4a1b627e46 e28675e2c7
commit 34c7ff0fe7
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"