summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/Launcher.java
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2011-02-10 14:08:57 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-10 14:08:57 -0800
commit8df4f319fedf6e5a083591d44cfe764ff6f82b5e (patch)
treea7cb21ba2803dba9afa3775f681865129614aac2 /src/com/android/launcher2/Launcher.java
parent43e21ac570286cc647ae2458c1a4e640882affcb (diff)
parentbbbad6bcc278f25b89aab71c6003593b984f0f03 (diff)
downloadandroid_packages_apps_Trebuchet-8df4f319fedf6e5a083591d44cfe764ff6f82b5e.tar.gz
android_packages_apps_Trebuchet-8df4f319fedf6e5a083591d44cfe764ff6f82b5e.tar.bz2
android_packages_apps_Trebuchet-8df4f319fedf6e5a083591d44cfe764ff6f82b5e.zip
Merge "NPE fix"
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
-rw-r--r--src/com/android/launcher2/Launcher.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 5779c6ad1..9a939e4ff 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2007,7 +2007,9 @@ public final class Launcher extends Activity
* Re-listen when widgets are reset.
*/
private void onAppWidgetReset() {
- mAppWidgetHost.startListening();
+ if (mAppWidgetHost != null) {
+ mAppWidgetHost.startListening();
+ }
}
/**