diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-04-11 14:13:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-11 14:13:00 -0700 |
| commit | 962a40fafb2b5d7fc66c46bdcb1e8d587d355c30 (patch) | |
| tree | e54a462c1f60ed820bac3672d19f873b03e142b1 | |
| parent | 34716a89e247aff6853122472a09762eed4a2fc6 (diff) | |
| parent | b68e03a83cfc8e59c0c93d070c5e3cc13cc2996b (diff) | |
| download | android_packages_apps_Trebuchet-962a40fafb2b5d7fc66c46bdcb1e8d587d355c30.tar.gz android_packages_apps_Trebuchet-962a40fafb2b5d7fc66c46bdcb1e8d587d355c30.tar.bz2 android_packages_apps_Trebuchet-962a40fafb2b5d7fc66c46bdcb1e8d587d355c30.zip | |
am b68e03a8: Fix NPE
* commit 'b68e03a83cfc8e59c0c93d070c5e3cc13cc2996b':
Fix NPE
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 2c0f6b05d..b2c36ee07 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1293,7 +1293,11 @@ public final class Launcher extends Activity final ViewTreeObserver.OnDrawListener listener = this; mWorkspace.post(new Runnable() { public void run() { - mWorkspace.getViewTreeObserver().removeOnDrawListener(listener); + if (mWorkspace != null && + mWorkspace.getViewTreeObserver() != null) { + mWorkspace.getViewTreeObserver(). + removeOnDrawListener(listener); + } } }); return; |