From f6fc22092a8dede9b983b5e30cab2979193bf0c6 Mon Sep 17 00:00:00 2001
From: Ricky Wai <rickywai@google.com>
Date: Tue, 12 Apr 2016 18:35:41 +0100
Subject: [PATCH] Unified work lock checkbox should roll back when user cancels
 confirm dialog

Bug: 28137228
Change-Id: I81cbd41462418ac25142c561c80394db1e6f7d74
---
 src/com/android/settings/SecuritySettings.java | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index bcb677dd34..653d3612af 100644
--- 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();
+        }
     }
 
 }
-- 
2.11.0