commit 779e6e4aecb26125de310d4c1edab3caf86387d2
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jul 31 03:08:50 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jul 31 03:08:50 2021 +0000
tree d3c3d5e7ea01346996f511ea974ae659240de77c
parent 3f3bc8499f3c29a979c9111e782824f3683fa9aa
parent d9639a9bf4a92be0c60018c127c7382989f40f74

Snap for 7599941 from d9639a9bf4a92be0c60018c127c7382989f40f74 to sc-release

Change-Id: If362bf707f7474f7659acafa1a7d94ee1f75f44a

tests/cts/net/src/android/net/cts/PacProxyManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/PacProxyManagerTest.java b/tests/cts/net/src/android/net/cts/PacProxyManagerTest.java
index a20f1cc..f0c8767 100644
--- a/tests/cts/net/src/android/net/cts/PacProxyManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/PacProxyManagerTest.java
@@ -16,6 +16,7 @@
 
 package android.net.cts;
 
+import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
 import static android.Manifest.permission.NETWORK_SETTINGS;
 
 import static com.android.testutils.TestPermissionUtil.runAsShell;
@@ -168,7 +169,9 @@
         mContext.registerReceiver(receiver, new IntentFilter(Proxy.PROXY_CHANGE_ACTION));
 
         // Call setCurrentProxyScriptUrl with the URL of the pac file.
-        runAsShell(NETWORK_SETTINGS, () -> {
+        // Note that the proxy script is global to device, and setting it from a different user
+        // should require INTERACT_ACROSS_USERS_FULL permission which the Settings app has.
+        runAsShell(NETWORK_SETTINGS, INTERACT_ACROSS_USERS_FULL, () -> {
             mPacProxyManager.setCurrentProxyScriptUrl(proxy);
         });