Merge "Unified work lock checkbox should roll back when user cancels confirm dialog" into nyc-dev

2016-04-13 10:04:23 +00:00
parent a3d18c03e8 f6fc22092a
commit 4f1994598b
1 changed files with 7 additions and 9 deletions
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -1282,17 +1282,15 @@ public class SecuritySettings extends SettingsPreferenceFragment
                                }
                            }
                    )
-                    .setNegativeButton(R.string.cancel,
-                            new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int whichButton) {
-                                    parentFragment.updateUnificationPreference();
-                                    dismiss();
-                                }
-                            }
-                    )
+                    .setNegativeButton(R.string.cancel, null)
                    .create();
        }
+
+        @Override
+        public void onDismiss(DialogInterface dialog) {
+            super.onDismiss(dialog);
+            ((SecuritySettings) getParentFragment()).updateUnificationPreference();
+        }
    }

 }