commit 340546a2af7939c108adea1b61fa06338d5ac163
author Keun young Park <keunyoung@google.com> Mon May 06 16:27:44 2019 -0700
committer Keun young Park <keunyoung@google.com> Thu May 30 16:07:10 2019 -0700
tree 33eef24e38346f009ee5aff2b0646db2af7b9ca4
parent 70554da78ddfdde58df157ea6ab816310272d1fb

Add useSystemProvidedLauncherForSecondary config

- Enabling this flag allows product to use the same secondary home launcher
  specified in config_secondaryHomeComponent always.
- In product like car, some secondary displays, only built-in secondary home
  launcher should be used.

Bug: 131112301
Test: Run added test
Change-Id: I62ca19b0570768cdc8dc9849306d6bf16bedccc4

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 765c9d0..b97ecec 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -5867,8 +5867,10 @@
      */
     Intent getSecondaryHomeIntent(String preferredPackage) {
         final Intent intent = new Intent(mTopAction, mTopData != null ? Uri.parse(mTopData) : null);
-        if (preferredPackage == null) {
-            // Using the component stored in config if no package name.
+        final boolean useSystemProvidedLauncher = mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_useSystemProvidedLauncherForSecondary);
+        if (preferredPackage == null || useSystemProvidedLauncher) {
+            // Using the component stored in config if no package name or forced.
             final String secondaryHomeComponent = mContext.getResources().getString(
                     com.android.internal.R.string.config_secondaryHomeComponent);
             intent.setComponent(ComponentName.unflattenFromString(secondaryHomeComponent));