Fix a couple issues with tracking launch cookies

- Fix NPE when there is no running task
- Fix issue where we were defaulting to a prediction icon when
  there was no launch cookie
- Don't use a launch cookie when we are launching from a non-workspace
  item, just fallback to the package name matching in that case

Fixes: 186653036
Fixes: 186593373
Test: Swipe up from various apps launched from predictions, also
      launch an app from all apps and swipe up and ensure it
      doesn't match a prediction
Change-Id: Ie8f5da010c140a5056045ac268d082c80271ab68
This commit is contained in:
Winson Chung
2021-04-28 21:13:46 -07:00
parent 5354abb0e7
commit 3c192b3f72
3 changed files with 20 additions and 4 deletions

View File

@@ -443,6 +443,19 @@ public abstract class BaseQuickstepLauncher extends Launcher
if (info == null) {
return;
}
switch (info.container) {
case LauncherSettings.Favorites.CONTAINER_DESKTOP:
case LauncherSettings.Favorites.CONTAINER_HOTSEAT:
// Fall through and continue it's on the workspace (we don't support swiping back
// to other containers like all apps or the hotseat predictions (which can change)
break;
default:
if (info.container >= 0) {
// Also allow swiping to folders
break;
}
return;
}
switch (info.itemType) {
case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT: