Cannot cancel in the "Warn app installation" dialog in security settings.

Bug: 16900059
Change-Id: Ie4e335b000350632bffc5740939b46b21357e298

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 1b9f44c..f2a0bbb 100644 (file)
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -404,16 +404,17 @@ public class SecuritySettings extends SettingsPreferenceFragment
                 .setIcon(com.android.internal.R.drawable.ic_dialog_alert)
                 .setMessage(getResources().getString(R.string.install_all_warning))
                 .setPositiveButton(android.R.string.yes, this)
-                .setNegativeButton(android.R.string.no, null)
+                .setNegativeButton(android.R.string.no, this)
                 .show();
     }
 
     @Override
     public void onClick(DialogInterface dialog, int which) {
-        if (dialog == mWarnInstallApps && which == DialogInterface.BUTTON_POSITIVE) {
-            setNonMarketAppsAllowed(true);
+        if (dialog == mWarnInstallApps) {
+            boolean turnOn = which == DialogInterface.BUTTON_POSITIVE;
+            setNonMarketAppsAllowed(turnOn);
             if (mToggleAppInstallation != null) {
-                mToggleAppInstallation.setChecked(true);
+                mToggleAppInstallation.setChecked(turnOn);
             }
         }
     }