commit 98e9c7472ccb8f45220f73bf1c693f681681c00a
author Paul Lawrence <paullawrence@google.com> Fri Sep 18 14:44:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 18 14:44:08 2015 +0000
tree 80f5b66e0aaaddd3d40235642177f7932b2dc7b4
parent e4c1dccda9719c1432b28eea90fbb0381d99638c
parent 8d28491a2f2d8ef8e2142171d290f46f381c8a76

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

* commit '8d28491a2f2d8ef8e2142171d290f46f381c8a76':
  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);
     }
 }