Merge "Ask profile password before unifying to prevent untrusted reset"

2018-07-09 18:07:36 +00:00
parent bf924bf8dd 80d9020cc2
commit 416a11855e
4 changed files with 82 additions and 59 deletions
--- a/src/com/android/settings/security/SecuritySettings.java
+++ b/src/com/android/settings/security/SecuritySettings.java
@@ -98,13 +98,8 @@ public class SecuritySettings extends DashboardFragment {
        super.onActivityResult(requestCode, resultCode, data);
    }

-    void launchConfirmDeviceLockForUnification() {
-        use(LockUnificationPreferenceController.class)
-                .launchConfirmDeviceLockForUnification();
-    }
-
-    void unifyUncompliantLocks() {
-        use(LockUnificationPreferenceController.class).unifyUncompliantLocks();
+    void startUnification() {
+        use(LockUnificationPreferenceController.class).startUnification();
    }

    void updateUnificationPreference() {