Merge "Fix testKeepaliveWifiUnsupported failure" am: 3b55c68cc2 am: c856c57a92

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684429

Change-Id: I3d81d13647a923c3c37121bc99d5238b14d94e62
This commit is contained in:
Treehugger Robot
2021-04-22 15:34:04 +00:00
committed by Automerger Merge Worker

View File

@@ -36,6 +36,9 @@
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" /> <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" /> <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
<!-- TODO (b/186093901): remove after fixing resource querying -->
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
<!-- This test also uses signature permissions through adopting the shell identity. <!-- This test also uses signature permissions through adopting the shell identity.
The permissions acquired that way include (probably not exhaustive) : The permissions acquired that way include (probably not exhaustive) :
android.permission.MANAGE_TEST_NETWORKS android.permission.MANAGE_TEST_NETWORKS