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

Merge "Add MANAGE_TEST_NETWORKS permission as @hide"

Browse Source
This commit is contained in:
Benedict Wong
2019-03-14 17:39:21 +00:00
committed by Gerrit Code Review
parent 17492d0691 600d93f1de
commit 96f51fd970
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/res/AndroidManifest.xml
View File

@@ -1384,6 +1384,13 @@
<permission android:name="android.permission.MANAGE_IPSEC_TUNNELS" <permission android:name="android.permission.MANAGE_IPSEC_TUNNELS"
android:protectionLevel="signature|appop" /> android:protectionLevel="signature|appop" />
<!-- @hide Allows apps to create and manage Test Networks.
<p>Granted only to shell. CTS tests will use
UiAutomation.AdoptShellPermissionIdentity() to gain access.
-->
<permission android:name="android.permission.MANAGE_TEST_NETWORKS"
android:protectionLevel="signature" />
<!-- @SystemApi @hide Allows applications to read Wi-Fi credential. <!-- @SystemApi @hide Allows applications to read Wi-Fi credential.
<p>Not for use by third-party applications. --> <p>Not for use by third-party applications. -->
<permission android:name="android.permission.READ_WIFI_CREDENTIAL" <permission android:name="android.permission.READ_WIFI_CREDENTIAL"

3
packages/Shell/AndroidManifest.xml
View File

@@ -159,6 +159,9 @@
<uses-permission android:name="android.permission.CONTROL_KEYGUARD" /> <uses-permission android:name="android.permission.CONTROL_KEYGUARD" />
<!-- Permission needed to run network tests in CTS -->
<uses-permission android:name="android.permission.MANAGE_TEST_NETWORKS" />
<application android:label="@string/app_label" <application android:label="@string/app_label"
android:defaultToDeviceProtectedStorage="true" android:defaultToDeviceProtectedStorage="true"
android:directBootAware="true"> android:directBootAware="true">