diff options
author | Paul Lawrence <paullawrence@google.com> | 2015-09-19 02:32:23 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-19 02:32:23 +0000 |
commit | 0f1e7bfe19f2ca7598399712adaedf5acefcfb0b (patch) | |
tree | 72b9cf3d2b2a1cb506333dbe7633451a60ecd50e /src | |
parent | d251fed3ef24b02697a375bf32f382338f500f53 (diff) | |
parent | b33741fce7041fdfa91e0bc31af7562c892f1452 (diff) | |
download | packages_apps_Settings-0f1e7bfe19f2ca7598399712adaedf5acefcfb0b.zip packages_apps_Settings-0f1e7bfe19f2ca7598399712adaedf5acefcfb0b.tar.gz packages_apps_Settings-0f1e7bfe19f2ca7598399712adaedf5acefcfb0b.tar.bz2 |
Merge "Revert "Remove don't kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/settings/CryptKeeper.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java index 6f217c4..45b4ff1 100644 --- 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); } } |