1 files changed, 11 insertions, 9 deletions
diff --git a/policy/src/com/android/internal/policy/impl/SimUnlockScreen.java b/policy/src/com/android/internal/policy/impl/SimUnlockScreen.java
index cfd985a..369161f 100644
--- a/policy/src/com/android/internal/policy/impl/SimUnlockScreen.java
+++ b/policy/src/com/android/internal/policy/impl/SimUnlockScreen.java
@@ -72,6 +72,14 @@ public class SimUnlockScreen extends LinearLayout implements KeyguardScreen, Vie
 
     private static final char[] DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
 
+    private BroadcastReceiver mThemeChangeReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            mUiContext = null;
+            mSimUnlockProgressDialog = null;
+        }
+    };
+
     public SimUnlockScreen(Context context, Configuration configuration,
             KeyguardUpdateMonitor updateMonitor, KeyguardScreenCallback callback,
             LockPatternUtils lockpatternutils) {
@@ -79,14 +87,6 @@ public class SimUnlockScreen extends LinearLayout implements KeyguardScreen, Vie
         mUpdateMonitor = updateMonitor;
         mCallback = callback;
 
-        ThemeUtils.registerThemeChangeReceiver(context, new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                mUiContext = null;
-                mSimUnlockProgressDialog = null;
-            }
-        });
-
         mCreationOrientation = configuration.orientation;
         mKeyboardHidden = configuration.hardKeyboardHidden;
         mLockPatternUtils = lockpatternutils;
@@ -127,7 +127,8 @@ public class SimUnlockScreen extends LinearLayout implements KeyguardScreen, Vie
 
     /** {@inheritDoc} */
     public void onPause() {
-
+        mContext.unregisterReceiver(mThemeChangeReceiver);
+        mUiContext = null;
     }
 
     /** {@inheritDoc} */
@@ -141,6 +142,7 @@ public class SimUnlockScreen extends LinearLayout implements KeyguardScreen, Vie
         mEnteredDigits = 0;
 
         mLockPatternUtils.updateEmergencyCallButtonState(mEmergencyCallButton);
+        ThemeUtils.registerThemeChangeReceiver(mContext, mThemeChangeReceiver);
     }
 
     /** {@inheritDoc} */