Merge "Revert "Remove don't kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev

2015-09-19 02:32:23 +00:00
parent d251fed3ef b33741fce7
commit 0f1e7bfe19
1 changed files with 2 additions and 1 deletions
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -1023,6 +1023,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
        PackageManager pm = context.getPackageManager();
        ComponentName name = new ComponentName(context, CryptKeeper.class);
        Log.d(TAG, "Disabling component " + name);
-        pm.setComponentEnabledSetting(name, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0);
+        pm.setComponentEnabledSetting(name, PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                PackageManager.DONT_KILL_APP);
    }
 }