commit 9db2961ad0596e41720bf99a437ba8aefa2e7f6f
author Paul Lawrence <paullawrence@google.com> Fri Sep 18 14:58:04 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 18 14:58:04 2015 +0000
tree d86e400f12fe0e4c1a4d94bf948e6cadb0384f72
parent 647ab07f9551e4e4ce030af55b2d86bfbb9a70a7
parent 1ec8f89b8e6efcb2453135a12a1a0a08ccdcb583

am 1ec8f89b: am 98e9c747: am 8d28491a: am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev

* commit '1ec8f89b8e6efcb2453135a12a1a0a08ccdcb583':
  Remove don't kill flag from CryptKeeper to stop logspam

src/com/android/settings/CryptKeeper.java

diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 45b4ff1..6f217c4 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -1023,7 +1023,6 @@
         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,
-                PackageManager.DONT_KILL_APP);
+        pm.setComponentEnabledSetting(name, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0);
     }
 }