From 6a8103c7efcaf6ea6e3170b36bf96dcfc1fa36b3 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 21 Oct 2011 11:08:32 -0700
Subject: [PATCH] Adding check in when getting current tab tag to prevent
 crash/NPE. (Bug: 5492469)

Change-Id: I51960bafbf1a9b2201639fb34786a7415e1e57dd
---
 .../launcher2/AppsCustomizePagedView.java     | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index 4103141db2..d8ff73c041 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -643,12 +643,14 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
     private void updateCurrentTab(int currentPage) {
         AppsCustomizeTabHost tabHost = getTabHost();
         String tag = tabHost.getCurrentTabTag();
-        if (currentPage >= mNumAppsPages &&
-                !tag.equals(tabHost.getTabTagForContentType(ContentType.Widgets))) {
-            tabHost.setCurrentTabFromContent(ContentType.Widgets);
-        } else if (currentPage < mNumAppsPages &&
-                !tag.equals(tabHost.getTabTagForContentType(ContentType.Applications))) {
-            tabHost.setCurrentTabFromContent(ContentType.Applications);
+        if (tag != null) {
+            if (currentPage >= mNumAppsPages &&
+                    !tag.equals(tabHost.getTabTagForContentType(ContentType.Widgets))) {
+                tabHost.setCurrentTabFromContent(ContentType.Widgets);
+            } else if (currentPage < mNumAppsPages &&
+                    !tag.equals(tabHost.getTabTagForContentType(ContentType.Applications))) {
+                tabHost.setCurrentTabFromContent(ContentType.Applications);
+            }
         }
     }
 
@@ -1367,8 +1369,10 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
     public void reset() {
         AppsCustomizeTabHost tabHost = getTabHost();
         String tag = tabHost.getCurrentTabTag();
-        if (!tag.equals(tabHost.getTabTagForContentType(ContentType.Applications))) {
-            tabHost.setCurrentTabFromContent(ContentType.Applications);
+        if (tag != null) {
+            if (!tag.equals(tabHost.getTabTagForContentType(ContentType.Applications))) {
+                tabHost.setCurrentTabFromContent(ContentType.Applications);
+            }
         }
         if (mCurrentPage != 0) {
             invalidatePageData(0);