diff options
| author | Winson Chung <winsonc@google.com> | 2011-10-21 14:38:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-21 14:38:29 -0700 |
| commit | 0ade43ab8c1daf4f753d33c216ef83bdc78c194d (patch) | |
| tree | d868e5db2086e4f762e440fdadb451465c3f06e3 | |
| parent | 3324335515dc6525b312adef5e548925e73725b5 (diff) | |
| parent | 29454729ae8bda1e478537965820b88c31bd091d (diff) | |
| download | android_packages_apps_Trebuchet-0ade43ab8c1daf4f753d33c216ef83bdc78c194d.tar.gz android_packages_apps_Trebuchet-0ade43ab8c1daf4f753d33c216ef83bdc78c194d.tar.bz2 android_packages_apps_Trebuchet-0ade43ab8c1daf4f753d33c216ef83bdc78c194d.zip | |
am 29454729: Merge "Adding check in when getting current tab tag to prevent crash/NPE. (Bug: 5492469)" into ics-mr0
* commit '29454729ae8bda1e478537965820b88c31bd091d':
Adding check in when getting current tab tag to prevent crash/NPE. (Bug: 5492469)
| -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); |