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

src/com/android/settings/SecuritySettings.java

@@ -1282,17 +1282,15 @@ public class SecuritySettings extends SettingsPreferenceFragment
                                 }
                             }
                     )
-                    .setNegativeButton(R.string.cancel,
+                    .setNegativeButton(R.string.cancel, null)
-                            new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int whichButton) {
-                                    parentFragment.updateUnificationPreference();
-                                    dismiss();
-                                }
-                            }
-                    )
                     .create();
         }
+
+        @Override
+        public void onDismiss(DialogInterface dialog) {
+            super.onDismiss(dialog);
+            ((SecuritySettings) getParentFragment()).updateUnificationPreference();
+        }
     }
 
 }