commit c64c9808b9ba74063f0a59e3b7b11e4c3d15680a
author Paul Lawrence <paullawrence@google.com> Fri Sep 12 21:44:48 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 12 21:44:48 2014 +0000
tree e9d041b7c56ac9a75df9073493791f2bfd6999a7
parent db9e3f682fd251a9c996141af73b285974dd9d1c
parent 5ab67c56488d0b0a24fa822a0df58608a7a82765

Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 11665b0..0fb6228 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1670,7 +1670,7 @@
                   android:launchMode="singleTop"
                   android:excludeFromRecents="true"
                   android:theme="@style/Theme.CryptKeeper"
-                  android:configChanges="keyboard|keyboardHidden|uiMode"
+                  android:configChanges="mnc|mcc|keyboard|keyboardHidden|uiMode"
                   android:windowSoftInputMode="adjustResize"
                   android:screenOrientation="nosensor">
             <intent-filter android:priority="10">