From eafd9db682c56c80cea19ec24001f5b162db5f0d Mon Sep 17 00:00:00 2001 From: Andrii Kulian Date: Wed, 5 Apr 2017 22:01:35 -0700 Subject: Add system config to specify Multi-Display support Added config_supportsMultiDisplay. Devices that have the config set to false will not allow launching activities on secondary screens. Bug: 36776777 Test: android.server.cts.ActivityManagerDisplayTests Test: #testMultiDisplayDisabled Change-Id: Iebb79044440866b1693897b0b53ccb987b5fd8e0 --- core/res/res/values-watch/config.xml | 4 ++++ core/res/res/values/config.xml | 3 +++ core/res/res/values/symbols.xml | 1 + .../java/com/android/server/am/ActivityManagerService.java | 3 +++ .../com/android/server/am/ActivityManagerShellCommand.java | 13 +++++++++++++ .../java/com/android/server/am/ActivityStackSupervisor.java | 9 +++++++++ .../core/java/com/android/server/am/ActivityStarter.java | 3 ++- 7 files changed, 35 insertions(+), 1 deletion(-) diff --git a/core/res/res/values-watch/config.xml b/core/res/res/values-watch/config.xml index ac7b236ba981..98dc4cfeaa89 100644 --- a/core/res/res/values-watch/config.xml +++ b/core/res/res/values-watch/config.xml @@ -66,4 +66,8 @@ false false + + + false diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 221e30874367..3dd7ad415baf 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2651,6 +2651,9 @@ true + + true + false diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index fa13fbf93267..01de079b4228 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -313,6 +313,7 @@ + diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index ee2fdba71576..65fa82a73e0e 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -1553,6 +1553,7 @@ public class ActivityManagerService extends IActivityManager.Stub boolean mSupportsSplitScreenMultiWindow; boolean mSupportsFreeformWindowManagement; boolean mSupportsPictureInPicture; + boolean mSupportsMultiDisplay; boolean mSupportsLeanbackOnly; IActivityController mController = null; boolean mControllerIsAMonkey = false; @@ -13926,6 +13927,8 @@ public class ActivityManagerService extends IActivityManager.Stub com.android.internal.R.fraction.thumbnail_fullscreen_scale, 1, 1); } mWaitForNetworkTimeoutMs = waitForNetworkTimeoutMs; + mSupportsMultiDisplay = res.getBoolean( + com.android.internal.R.bool.config_supportsMultiDisplay); } } diff --git a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java index 748aa6ff256a..601141827f3c 100644 --- a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java +++ b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java @@ -247,6 +247,8 @@ final class ActivityManagerShellCommand extends ShellCommand { return runSupportsMultiwindow(pw); case "supports-split-screen-multi-window": return runSupportsSplitScreenMultiwindow(pw); + case "supports-multi-display": + return runSupportsMultiDisplay(pw); case "update-appinfo": return runUpdateApplicationInfo(pw); case "no-home-screen": @@ -2398,6 +2400,15 @@ final class ActivityManagerShellCommand extends ShellCommand { return 0; } + int runSupportsMultiDisplay(PrintWriter pw) throws RemoteException { + final Resources res = getResources(pw); + if (res == null) { + return -1; + } + pw.println(res.getBoolean(com.android.internal.R.bool.config_supportsMultiDisplay)); + return 0; + } + int runUpdateApplicationInfo(PrintWriter pw) throws RemoteException { int userid = UserHandle.parseUserArg(getNextArgRequired()); ArrayList packages = new ArrayList<>(); @@ -2627,6 +2638,8 @@ final class ActivityManagerShellCommand extends ShellCommand { pw.println(" Returns true if the device supports multiwindow."); pw.println(" supports-split-screen-multi-window"); pw.println(" Returns true if the device supports split screen multiwindow."); + pw.println(" supports-multi-display"); + pw.println(" Returns true if the device supports multi-display."); pw.println(" suppress-resize-config-changes "); pw.println(" Suppresses configuration changes due to user resizing an activity/task."); pw.println(" set-inactive [--user ] true|false"); diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 3e3fee54bdd0..30e33c83e7be 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -2782,6 +2782,15 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D + " reparent task=" + task + " to stackId=" + stackId); } + // Ensure that we're not moving a task to a dynamic stack if device doesn't support + // multi-display. + // TODO(multi-display): Support non-dynamic stacks on secondary displays. + // TODO: Check ActivityView after fixing b/35349678. + if (StackId.isDynamicStack(stackId) && !mService.mSupportsMultiDisplay) { + throw new IllegalArgumentException("Device doesn't support multi-display, can not" + + " reparent task=" + task + " to stackId=" + stackId); + } + // Ensure that we aren't trying to move into a freeform stack without freeform // support if (stackId == FREEFORM_WORKSPACE_STACK_ID && !mService.mSupportsFreeformWindowManagement) { diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index b4085697f2da..bb5f5884773e 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -2178,7 +2178,8 @@ class ActivityStarter { case ASSISTANT_STACK_ID: return r.isAssistantActivity(); default: - if (StackId.isDynamicStack(stackId)) { + // TODO: Check ActivityView after fixing b/35349678. + if (StackId.isDynamicStack(stackId) && mService.mSupportsMultiDisplay) { return true; } Slog.e(TAG, "isValidLaunchStackId: Unexpected stackId=" + stackId); -- cgit v1.2.3-59-g8ed1b