diff options
author | Adam Cohen <adamcohen@google.com> | 2010-11-11 10:48:05 -0800 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2010-11-11 10:55:02 -0800 |
commit | d113e0c4abc8b3818dd683dcf86f53fc32e3b354 (patch) | |
tree | 50e5f5324c9d0cb96b7102aa155c9c73018fde67 /src/com | |
parent | ded9f8d8658d0b6601006c0a954cd3bf530e55c1 (diff) | |
download | android_packages_apps_Trebuchet-d113e0c4abc8b3818dd683dcf86f53fc32e3b354.tar.gz android_packages_apps_Trebuchet-d113e0c4abc8b3818dd683dcf86f53fc32e3b354.tar.bz2 android_packages_apps_Trebuchet-d113e0c4abc8b3818dd683dcf86f53fc32e3b354.zip |
Fixing a launcher crash on boot
Change-Id: I2f026eebde300ce8b8966caa826fa81792af496d
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 4f6f7d8f5..81e1847ff 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -228,6 +228,9 @@ public final class Launcher extends Activity private LauncherModel mModel; private IconCache mIconCache; + private boolean mUserPresent = true; + private boolean mVisible = false; + private boolean mAttached = false; private static LocaleConfiguration sLocaleConfiguration = null; @@ -1151,9 +1154,6 @@ public final class Launcher extends Activity } } - private boolean mUserPresent = true; - private boolean mVisible = false; - private final BroadcastReceiver mReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -1178,6 +1178,7 @@ public final class Launcher extends Activity filter.addAction(Intent.ACTION_USER_PRESENT); registerReceiver(mReceiver, filter); + mAttached = true; mVisible = true; } @@ -1186,7 +1187,10 @@ public final class Launcher extends Activity super.onDetachedFromWindow(); mVisible = false; - unregisterReceiver(mReceiver); + if (mAttached) { + unregisterReceiver(mReceiver); + mAttached = false; + } updateRunning(); } |