commit 48627bc0109be8e03775ca89ffc5a19dee11517a
author Alan Chen <alanschen@google.com> Thu Sep 15 16:26:01 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 15 16:26:01 2022 +0000
tree 58d95da113d1086b028ae5b9764636fdd8cd2fa5
parent 2ac2063b4f1c3f9a582df341c0eb9c02c6405d62
parent b367fa1cd69ed39481efe8153eb33b47bdb8a3ab

DO NOT MERGE Remove long press for media apps am: b367fa1cd6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Launcher/+/19931406

Change-Id: I1655b64a145402950428f21b55ed36fcaa2cb82a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/car/carlauncher/AppLauncherUtils.java

diff --git a/src/com/android/car/carlauncher/AppLauncherUtils.java b/src/com/android/car/carlauncher/AppLauncherUtils.java
index 3b4eda0..0d637bf 100644
--- a/src/com/android/car/carlauncher/AppLauncherUtils.java
+++ b/src/com/android/car/carlauncher/AppLauncherUtils.java
@@ -261,15 +261,7 @@
                                         carMediaManager);
                             }
                         },
-                        contextArg -> {
-                            // getLaunchIntentForPackage looks for a main activity in the category
-                            // Intent.CATEGORY_INFO, then Intent.CATEGORY_LAUNCHER, and returns null
-                            // if neither are found
-                            Intent packageLaunchIntent =
-                                    packageManager.getLaunchIntentForPackage(packageName);
-                            AppLauncherUtils.launchApp(contextArg,
-                                    packageLaunchIntent != null ? packageLaunchIntent : intent);
-                        });
+                        /* alternateLaunchCallback */ null);
                     launchablesMap.put(componentName, appMetaData);
                 }
             }
@@ -298,7 +290,7 @@
                         info.getBadgedIcon(0),
                         isDistractionOptimized,
                         contextArg -> AppLauncherUtils.launchApp(contextArg, intent),
-                        null);
+                        /* alternateLaunchCallback */ null);
                     launchablesMap.put(componentName, appMetaData);
                 }
             }
@@ -342,7 +334,7 @@
                             Log.i(TAG, "Successfully enabled package [" + packageName + "]");
                             AppLauncherUtils.launchApp(contextArg, intent);
                         },
-                        null);
+                        /* alternateLaunchCallback */ null);
                 launchablesMap.put(componentName, appMetaData);
             }
         }