diff options
| author | Winson Chung <winsonc@google.com> | 2011-10-21 12:26:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-21 12:26:21 -0700 |
| commit | 29454729ae8bda1e478537965820b88c31bd091d (patch) | |
| tree | 76557d0e2a3a6b6897e007ef011019769e07f286 /src | |
| parent | 54103eb3f9fb6e1fd4d1b83c784a23b80323ec75 (diff) | |
| parent | 6a8103c7efcaf6ea6e3170b36bf96dcfc1fa36b3 (diff) | |
| download | android_packages_apps_Trebuchet-29454729ae8bda1e478537965820b88c31bd091d.tar.gz android_packages_apps_Trebuchet-29454729ae8bda1e478537965820b88c31bd091d.tar.bz2 android_packages_apps_Trebuchet-29454729ae8bda1e478537965820b88c31bd091d.zip | |
Merge "Adding check in when getting current tab tag to prevent crash/NPE. (Bug: 5492469)" into ics-mr0
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); |