commit 6b8de23581e707cd0afa91bda228d213921fcad7
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 15 16:41:14 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 15 16:41:14 2020 +0000
tree f2f8b55b3c9e3ee47b657b76b6d86aba325ebbd7
parent 2a98322bb4e9c639c50cfc3249b9b38d25e494db
parent 932a0c300a44fb2109c703c852bba0621103f1bd

Merge "Always set secure FRP setting on user 0" into rvc-dev

tests/tests/content/pm/SecureFrp/src/com/android/tests/securefrpinstall/SecureFrpInstallTest.java

diff --git a/tests/tests/content/pm/SecureFrp/src/com/android/tests/securefrpinstall/SecureFrpInstallTest.java b/tests/tests/content/pm/SecureFrp/src/com/android/tests/securefrpinstall/SecureFrpInstallTest.java
index 2f1dfc7..e2712e6 100644
--- a/tests/tests/content/pm/SecureFrp/src/com/android/tests/securefrpinstall/SecureFrpInstallTest.java
+++ b/tests/tests/content/pm/SecureFrp/src/com/android/tests/securefrpinstall/SecureFrpInstallTest.java
@@ -59,7 +59,7 @@
     private static void setSecureFrp(boolean secureFrp) throws Exception {
         adoptShellPermissions();
         SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(),
-                "settings put secure secure_frp_mode " + (secureFrp ? "1" : "0"));
+                "settings put --user 0 secure secure_frp_mode " + (secureFrp ? "1" : "0"));
         dropShellPermissions();
     }