summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2013-04-11 11:36:41 -0700
committerSteve Kondik <shade@chemlab.org>2013-08-17 02:35:26 -0700
commit4747cf1a489aefa8c7f81c2d0b9ffe294351c398 (patch)
tree97fc3f9df2d09a6ffba36ab51c21df55298f6315 /src/com
parent9f18e8f78ef2772edf94987cfb5129c71e62aac5 (diff)
downloadandroid_packages_apps_Trebuchet-4747cf1a489aefa8c7f81c2d0b9ffe294351c398.tar.gz
android_packages_apps_Trebuchet-4747cf1a489aefa8c7f81c2d0b9ffe294351c398.tar.bz2
android_packages_apps_Trebuchet-4747cf1a489aefa8c7f81c2d0b9ffe294351c398.zip
Fix NPE
Bug: 8596760 Change-Id: I401aa0f9a1b8b1c167b502f6aad11cb0f98b7c33
Diffstat (limited to 'src/com')
-rw-r--r--src/com/cyanogenmod/trebuchet/Launcher.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java
index 9ab911194..3901fec1a 100644
--- a/src/com/cyanogenmod/trebuchet/Launcher.java
+++ b/src/com/cyanogenmod/trebuchet/Launcher.java
@@ -1512,7 +1512,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;