diff options
| author | Winson Chung <winsonc@google.com> | 2011-10-21 11:08:32 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2011-10-21 11:09:16 -0700 |
| commit | 6a8103c7efcaf6ea6e3170b36bf96dcfc1fa36b3 (patch) | |
| tree | cdf03a91e377e6548aef1043470901e8b3686244 /src | |
| parent | dd3a3d9cf94b80c356ca1d9ca62a3b90e0d56c5c (diff) | |
| download | android_packages_apps_Trebuchet-6a8103c7efcaf6ea6e3170b36bf96dcfc1fa36b3.tar.gz android_packages_apps_Trebuchet-6a8103c7efcaf6ea6e3170b36bf96dcfc1fa36b3.tar.bz2 android_packages_apps_Trebuchet-6a8103c7efcaf6ea6e3170b36bf96dcfc1fa36b3.zip | |
Adding check in when getting current tab tag to prevent crash/NPE. (Bug: 5492469)
Change-Id: I51960bafbf1a9b2201639fb34786a7415e1e57dd
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index 4103141db..d8ff73c04 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); |