summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornebkat <nebkat@teamhacksung.org>2012-04-08 20:46:40 +0400
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2012-04-08 20:46:40 +0400
commit43b803b08d47d6cf59267a02661e1915ede3c8e3 (patch)
treeb401e515a9f5fa8f8c8ff27ac6acd3f412ec04b5
parent00e936fa77f6e120e4464018c98b2517aa177aba (diff)
parentca72eb2a9754221686dff9e4322e71971e664c69 (diff)
downloadandroid_packages_apps_Trebuchet-43b803b08d47d6cf59267a02661e1915ede3c8e3.tar.gz
android_packages_apps_Trebuchet-43b803b08d47d6cf59267a02661e1915ede3c8e3.tar.bz2
android_packages_apps_Trebuchet-43b803b08d47d6cf59267a02661e1915ede3c8e3.zip
Merge "AppsCustomizePagedView: Fix possible NPE" into ics
-rw-r--r--src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java b/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
index f3ca9e794..eb1642c2f 100644
--- a/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
+++ b/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
@@ -493,7 +493,9 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
}
public void showAllAppsCling() {
- Cling allAppsCling = (Cling) getTabHost().findViewById(R.id.all_apps_cling);
+ AppsCustomizeTabHost tabHost = getTabHost();
+ if (tabHost == null) return;
+ Cling allAppsCling = (Cling) tabHost.findViewById(R.id.all_apps_cling);
if (!mHasShownAllAppsCling && isDataReady() && testDataReady()) {
mHasShownAllAppsCling = true;
// Calculate the position for the cling punch through