diff options
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 6 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 6 | ||||
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index c2ae5a1cb..7b880430b 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -4595,11 +4595,11 @@ public class Launcher extends Activity SharedPreferences sp = getSharedPreferences( LauncherAppState.getSharedPreferencesKey(), MODE_PRIVATE); int widgetId = sp.getInt(QSB_WIDGET_ID, -1); + AppWidgetProviderInfo widgetInfo = mAppWidgetManager.getAppWidgetInfo(widgetId); if (!searchProvider.provider.flattenToString().equals( sp.getString(QSB_WIDGET_PROVIDER, null)) - || (widgetId == -1) - || !mAppWidgetManager.getAppWidgetInfo(widgetId).provider - .equals(searchProvider.provider)) { + || (widgetInfo == null) + || !widgetInfo.provider.equals(searchProvider.provider)) { // A valid widget is not already bound. if (widgetId > -1) { mAppWidgetHost.deleteAppWidgetId(widgetId); diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index 64912682a..dd2f48b18 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -1512,6 +1512,12 @@ public class LauncherProvider extends ContentProvider { userHandle = UserHandleCompat.myUserHandle(); userSerialNumber = userManager.getSerialNumberForUser(userHandle); } + + if (userHandle == null) { + Launcher.addDumpLog(TAG, "skipping deleted user", true); + continue; + } + Launcher.addDumpLog(TAG, "migrating \"" + c.getString(titleIndex) + "\" (" + cellX + "," + cellY + "@" 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); } |