diff options
author | Michael Jurka <mikejurka@google.com> | 2013-04-11 11:36:41 -0700 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2013-04-11 11:40:21 -0700 |
commit | b68e03a83cfc8e59c0c93d070c5e3cc13cc2996b (patch) | |
tree | e54a462c1f60ed820bac3672d19f873b03e142b1 /src/com/android | |
parent | 813a757b2223fcfa57a1108d9dd31c16293720b8 (diff) | |
download | android_packages_apps_Trebuchet-b68e03a83cfc8e59c0c93d070c5e3cc13cc2996b.tar.gz android_packages_apps_Trebuchet-b68e03a83cfc8e59c0c93d070c5e3cc13cc2996b.tar.bz2 android_packages_apps_Trebuchet-b68e03a83cfc8e59c0c93d070c5e3cc13cc2996b.zip |
Fix NPE
Bug: 8596760
Change-Id: I401aa0f9a1b8b1c167b502f6aad11cb0f98b7c33
Diffstat (limited to 'src/com/android')
-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; |