diff options
| author | Adnan Begovic <adnan@cyngn.com> | 2015-09-11 14:15:10 -0700 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2015-09-11 14:45:31 -0700 |
| commit | 03b202e6b17e0b6be94eb70606e2bcb9a4f6e090 (patch) | |
| tree | 91497d33050b4da9a8bbe8c7475918e17b24f041 | |
| parent | f3c0e343f0f7c5ce32390e8402519456b32978b2 (diff) | |
| download | android_packages_apps_Trebuchet-03b202e6b17e0b6be94eb70606e2bcb9a4f6e090.tar.gz android_packages_apps_Trebuchet-03b202e6b17e0b6be94eb70606e2bcb9a4f6e090.tar.bz2 android_packages_apps_Trebuchet-03b202e6b17e0b6be94eb70606e2bcb9a4f6e090.zip | |
Trebuchet: Make sure callbacks are available on user change.
When switching from Owner -> Guest profile, the callbacks for
LauncherModel may not be supplied by the incoming restricted
user.
Change-Id: I15c49f3f30fea9397bee5ae8bde4b0c7f585ae07
TICKET: CYNGNOS-997
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 9aaacd881..91fe50a5a 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1875,7 +1875,7 @@ public class LauncherModel extends BroadcastReceiver long containerIndex = item.screenId; if (item.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { // Return early if we detect that an item is under the hotseat button - if (mCallbacks == null || + if (mCallbacks == null || mCallbacks.get() == null || mCallbacks.get().isAllAppsButtonRank((int) item.screenId)) { deleteOnInvalidPlacement.set(true); Log.e(TAG, "Error loading shortcut into hotseat " + item |