diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2014-11-14 11:59:57 -0800 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2015-09-27 21:04:20 -0700 |
commit | 76c81b4a4c078a7096b3d643d3c0afc197229ee7 (patch) | |
tree | 5f3bb805e08408d488efadac41d7f76ddda458bb /src/com/android/launcher3/Workspace.java | |
parent | e05f05dd78ca156f9937814e5f6ca5ec85f5dcdd (diff) | |
download | android_packages_apps_Trebuchet-76c81b4a4c078a7096b3d643d3c0afc197229ee7.tar.gz android_packages_apps_Trebuchet-76c81b4a4c078a7096b3d643d3c0afc197229ee7.tar.bz2 android_packages_apps_Trebuchet-76c81b4a4c078a7096b3d643d3c0afc197229ee7.zip |
Adding a few null checks.
1) During migration, if launcher2 has deleted user data,
migration oes not happen
2) If Launcher3 does not has bind widget permission,
QSB would be null.
Bug: 18388507
Change-Id: Ief81f6f77ce154e7b3ecd4b77caf24239401e738
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 96be50235..3c6ab317a 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2637,7 +2637,7 @@ public class Workspace extends SmoothPagedView AlphaUpdateListener.updateVisibility(pageIndicator); } - if (mShowSearchBar && !mLauncher.getDragController().isDragging()) { + if (searchBar != null && mShowSearchBar && !mLauncher.getDragController().isDragging()) { searchBar.setAlpha(finalSearchBarAlpha); AlphaUpdateListener.updateVisibility(searchBar); } |