diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-09-29 13:15:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-29 13:15:15 -0700 |
| commit | 1a70a5124fb1041e71fc631c8fab90a86daea546 (patch) | |
| tree | 47c3e5367138a7846c63b0100e3635a55d2b44bc | |
| parent | b00dcaefd081665e69105bd43abbcfc596e7566a (diff) | |
| parent | 82398369f3a925ce15a37a968d050a4de422c7fa (diff) | |
| download | android_packages_apps_Trebuchet-1a70a5124fb1041e71fc631c8fab90a86daea546.tar.gz android_packages_apps_Trebuchet-1a70a5124fb1041e71fc631c8fab90a86daea546.tar.bz2 android_packages_apps_Trebuchet-1a70a5124fb1041e71fc631c8fab90a86daea546.zip | |
am 82398369: Fixing NPE in onFinishBindingItems (issue 10975740)
* commit '82398369f3a925ce15a37a968d050a4de422c7fa':
Fixing NPE in onFinishBindingItems (issue 10975740)
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index bf12d7948..ba34c136c 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -915,7 +915,7 @@ public class Launcher extends Activity } protected void onFinishBindingItems() { - if (hasCustomContentToLeft() && mWorkspace.hasCustomContent()) { + if (mWorkspace != null && hasCustomContentToLeft() && mWorkspace.hasCustomContent()) { addCustomContentToLeft(); } } |