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

Merge "Make pull atom permission accessible to shell" into rvc-dev am: 0e4f868bb2

Browse Source 
Change-Id: I481fd30653b427218fdb241d7f0a1e47aa5736b2
This commit is contained in:
Automerger Merge Worker
2020-03-04 22:09:54 +00:00
parent 4ae3a6e0f4 0e4f868bb2
commit 660b4a3c49
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -392,6 +392,8 @@ applications that come with the platform
<permission name="android.permission.MANAGE_NOTIFICATIONS"/> <permission name="android.permission.MANAGE_NOTIFICATIONS"/>
<!-- Permission required for CompanionDeviceManager CTS test. --> <!-- Permission required for CompanionDeviceManager CTS test. -->
<permission name="android.permission.COMPANION_APPROVE_WIFI_CONNECTIONS" /> <permission name="android.permission.COMPANION_APPROVE_WIFI_CONNECTIONS" />
<!-- Permission required for testing registering pull atom callbacks. -->
<permission name="android.permission.REGISTER_STATS_PULL_ATOM"/>
</privapp-permissions> </privapp-permissions>
<privapp-permissions package="com.android.statementservice"> <privapp-permissions package="com.android.statementservice">

3
packages/Shell/AndroidManifest.xml
View File

@@ -273,6 +273,9 @@
<!-- Permission needed to read wifi network credentials for CtsNetTestCases --> <!-- Permission needed to read wifi network credentials for CtsNetTestCases -->
<uses-permission android:name="android.permission.READ_WIFI_CREDENTIAL" /> <uses-permission android:name="android.permission.READ_WIFI_CREDENTIAL" />
<!-- Permission needed to test registering pull atom callbacks -->
<uses-permission android:name="android.permission.REGISTER_STATS_PULL_ATOM" />
<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"