Add option to use RESET_PASSWORD_REQUIRE_ENTRY flag when resetting

password in TestDPC.

Test: None
Change-Id: I266e2eff772eb13e590cef2887d7d6828d8227ed

Author: arangelov

app/src/main/java/com/afwsamples/testdpc/policy/resetpassword/ResetPasswordWithTokenFragment.java

@@ -64,6 +64,7 @@ public class ResetPasswordWithTokenFragment extends Fragment implements View.OnC
     private Button mBtnSetPassword;
     private CheckBox mChkRequireEntry;
     private CheckBox mChkDoNotRequirePasswordOnBoot;
+    private CheckBox mChkDoNotAllowOtherAdminsChange;
     private Button mBtnActivateToken;
     private KeyguardManager mKeyguardMgr;
 
@@ -135,6 +136,8 @@ public View onCreateView(LayoutInflater layoutInflater, ViewGroup container,
         mChkRequireEntry = (CheckBox) view.findViewById(R.id.require_password_entry_checkbox);
         mChkDoNotRequirePasswordOnBoot = (CheckBox) view.findViewById(
                 R.id.dont_require_password_on_boot_checkbox);
+        mChkDoNotAllowOtherAdminsChange =
+                (CheckBox) view.findViewById(R.id.dont_allow_other_admins_change_password);
 
         mBtnNewToken = (Button) view.findViewById(R.id.btnNewToken);
         mBtnRemoveToken = (Button) view.findViewById(R.id.btnRemoveToken);
@@ -227,6 +230,8 @@ private void resetPasswordWithToken() {
                 DevicePolicyManager.RESET_PASSWORD_REQUIRE_ENTRY : 0;
         flags |= mChkDoNotRequirePasswordOnBoot.isChecked() ?
                 DevicePolicyManager.RESET_PASSWORD_DO_NOT_ASK_CREDENTIALS_ON_BOOT : 0;
+        flags |= mChkDoNotAllowOtherAdminsChange.isChecked() ?
+                DevicePolicyManager.RESET_PASSWORD_REQUIRE_ENTRY : 0;
 
         if (token != null) {
             boolean result = mDpm.resetPasswordWithToken(

app/src/main/java/com/afwsamples/testdpc/transferownership/PickTransferComponentFragment.java

@@ -105,8 +105,10 @@ private String performTransfer(ComponentName target) {
         Log.i(getClass().getName(), "Transferring ownership from " + source
                 + " to target " + target);
         try {
+            PersistableBundle persistableBundle = new PersistableBundle();
+            persistableBundle.putString("random_key", "random_value");
             com.afwsamples.testdpc.common.ReflectionUtil.invoke(mDevicePolicyManager,
-                    "transferOwnership", source, target, new PersistableBundle());
+                    "transferOwnership", source, target, persistableBundle);
             return "Success!";
         } catch (ReflectionUtil.ReflectionIsTemporaryException e) {
             Throwable cause = e.getCause();

app/src/main/res/layout/reset_password_token.xml

@@ -88,7 +88,7 @@ limitations under the License.
         android:layout_height="wrap_content"
         android:layout_below="@+id/edtTokenStatus"
         android:layout_alignStart="@+id/textView"
-        android:layout_marginTop="92dp"
+        android:layout_marginTop="30dp"
         android:id="@+id/textView3" />
 
     <EditText
@@ -151,11 +151,19 @@ limitations under the License.
         android:layout_below="@+id/require_password_entry_checkbox"
         android:layout_alignStart="@+id/btnSetPassword" />
 
+    <CheckBox
+        android:layout_below="@+id/dont_require_password_on_boot_checkbox"
+        android:text="@string/do_not_allow_other_admins_change_password"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/dont_allow_other_admins_change_password"
+        android:layout_alignStart="@+id/btnSetPassword" />
+
     <Button
         android:text="@string/reset_password_fragment_set_password"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/btnSetPassword"
-        android:layout_below="@+id/dont_require_password_on_boot_checkbox"
+        android:layout_below="@+id/dont_allow_other_admins_change_password"
         android:layout_alignEnd="@+id/btnNewToken" />
 </RelativeLayout>

app/src/main/res/values/strings.xml

@@ -819,6 +819,7 @@
     <string name="dont_require_password_on_boot">Do not require password to start user in future</string>
     <string name="password_reset_success">Password has been reset</string>
     <string name="password_reset_failed">Failed to reset password</string>
+    <string name="do_not_allow_other_admins_change_password">Do not allow other admins to change the password again until the user has entered it.</string>
 
     <!-- Strings for trust agent -->
     <string name="saved_trust_agent_config">Saved trust agent configuration</string>