Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Send task description changed though task org taskInfoChanged" into rvc-dev am: 3908fb22b6 am: 068eabcc85

Browse Source 
Change-Id: I4a843fd5bf313c0a4babf4c26e3d92ef7e073cd9
This commit is contained in:
Winson Chung
2020-04-13 17:40:35 +00:00
committed by Automerger Merge Worker
parent 20703eb342 068eabcc85
commit 1a24a44553
13 changed files with 119 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/test-current.txt
View File

@@ -5232,14 +5232,14 @@ package android.window {
method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public static java.util.List<android.app.ActivityManager.RunningTaskInfo> getChildTasks(@NonNull android.window.WindowContainerToken, @NonNull int[]);
method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public static android.window.WindowContainerToken getImeTarget(int);
method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public static java.util.List<android.app.ActivityManager.RunningTaskInfo> getRootTasks(int, @NonNull int[]);
method public void onBackPressedOnTaskRoot(@NonNull android.app.ActivityManager.RunningTaskInfo);
method public void onTaskAppeared(@NonNull android.app.ActivityManager.RunningTaskInfo);
method public void onTaskInfoChanged(@NonNull android.app.ActivityManager.RunningTaskInfo);
method public void onTaskVanished(@NonNull android.app.ActivityManager.RunningTaskInfo);
method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void registerOrganizer(int);
method @BinderThread public void onBackPressedOnTaskRoot(@NonNull android.app.ActivityManager.RunningTaskInfo);
method @BinderThread public void onTaskAppeared(@NonNull android.app.ActivityManager.RunningTaskInfo);
method @BinderThread public void onTaskInfoChanged(@NonNull android.app.ActivityManager.RunningTaskInfo);
method @BinderThread public void onTaskVanished(@NonNull android.app.ActivityManager.RunningTaskInfo);
method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public final void registerOrganizer(int);
method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void setInterceptBackPressedOnTaskRoot(boolean);
method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public static void setLaunchRoot(int, @NonNull android.window.WindowContainerToken);
method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void unregisterOrganizer();
method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public final void unregisterOrganizer();
}
public final class WindowContainerToken implements android.os.Parcelable {

34
core/java/android/app/ActivityManager.java
View File

@@ -69,6 +69,7 @@ import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.WorkSource;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.DisplayMetrics;
import android.util.Singleton;
@@ -1597,6 +1598,39 @@ public class ActivityManager {
+ " resizeMode: " + ActivityInfo.resizeModeToString(mResizeMode)
+ " minWidth: " + mMinWidth + " minHeight: " + mMinHeight;
}
@Override
public boolean equals(Object obj) {
if (!(obj instanceof TaskDescription)) {
return false;
}
TaskDescription other = (TaskDescription) obj;
return TextUtils.equals(mLabel, other.mLabel)
&& TextUtils.equals(mIconFilename, other.mIconFilename)
&& mIcon == other.mIcon
&& mColorPrimary == other.mColorPrimary
&& mColorBackground == other.mColorBackground
&& mStatusBarColor == other.mStatusBarColor
&& mNavigationBarColor == other.mNavigationBarColor
&& mEnsureStatusBarContrastWhenTransparent
== other.mEnsureStatusBarContrastWhenTransparent
&& mEnsureNavigationBarContrastWhenTransparent
== other.mEnsureNavigationBarContrastWhenTransparent
&& mResizeMode == other.mResizeMode
&& mMinWidth == other.mMinWidth
&& mMinHeight == other.mMinHeight;
}
/** @hide */
public static boolean equals(TaskDescription td1, TaskDescription td2) {
if (td1 == null && td2 == null) {
return true;
} else if (td1 != null && td2 != null) {
return td1.equals(td2);
}
return false;
}
}
/**

24
core/java/android/window/TaskEmbedder.java
View File

@@ -26,7 +26,6 @@ import android.app.ActivityTaskManager;
import android.app.ActivityView;
import android.app.IActivityTaskManager;
import android.app.PendingIntent;
import android.app.TaskStackListener;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -129,7 +128,6 @@ public abstract class TaskEmbedder {
protected SurfaceControl.Transaction mTransaction;
protected SurfaceControl mSurfaceControl;
protected TaskStackListener mTaskStackListener;
protected Listener mListener;
protected boolean mOpened; // Protected by mGuard.
@@ -170,13 +168,6 @@ public abstract class TaskEmbedder {
if (!onInitialize()) {
return false;
}
mTaskStackListener = createTaskStackListener();
try {
mActivityTaskManager.registerTaskStackListener(mTaskStackListener);
} catch (RemoteException e) {
Log.e(TAG, "Failed to register task stack listener", e);
}
if (mListener != null && isInitialized()) {
mListener.onInitialized();
}
@@ -186,11 +177,6 @@ public abstract class TaskEmbedder {
return true;
}
/**
* @return the task stack listener for this embedder
*/
public abstract TaskStackListener createTaskStackListener();
/**
* Whether this container has been initialized.
*
@@ -420,16 +406,6 @@ public abstract class TaskEmbedder {
mSurfaceControl.release();
boolean reportReleased = onRelease();
if (mTaskStackListener != null) {
try {
mActivityTaskManager.unregisterTaskStackListener(mTaskStackListener);
} catch (RemoteException e) {
Log.e(TAG, "Failed to unregister task stack listener", e);
}
mTaskStackListener = null;
}
if (mListener != null && reportReleased) {
mListener.onReleased();
}

13
core/java/android/window/TaskOrganizer.java
View File

@@ -16,6 +16,7 @@
package android.window;
import android.annotation.BinderThread;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
@@ -39,7 +40,7 @@ public class TaskOrganizer extends WindowOrganizer {
* and receive taskVanished callbacks in the process.
*/
@RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)
public void registerOrganizer(int windowingMode) {
public final void registerOrganizer(int windowingMode) {
try {
getController().registerTaskOrganizer(mInterface, windowingMode);
} catch (RemoteException e) {
@@ -49,7 +50,7 @@ public class TaskOrganizer extends WindowOrganizer {
/** Unregisters a previously registered task organizer. */
@RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)
public void unregisterOrganizer() {
public final void unregisterOrganizer() {
try {
getController().unregisterTaskOrganizer(mInterface);
} catch (RemoteException e) {
@@ -57,13 +58,17 @@ public class TaskOrganizer extends WindowOrganizer {
}
}
@BinderThread
public void onTaskAppeared(@NonNull ActivityManager.RunningTaskInfo taskInfo) {}
@BinderThread
public void onTaskVanished(@NonNull ActivityManager.RunningTaskInfo taskInfo) {}
public void onTaskInfoChanged(@NonNull ActivityManager.RunningTaskInfo info) {}
@BinderThread
public void onTaskInfoChanged(@NonNull ActivityManager.RunningTaskInfo taskInfo) {}
public void onBackPressedOnTaskRoot(@NonNull ActivityManager.RunningTaskInfo info) {}
@BinderThread
public void onBackPressedOnTaskRoot(@NonNull ActivityManager.RunningTaskInfo taskInfo) {}
/** Creates a persistent root task in WM for a particular windowing-mode. */
@RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

37
core/java/android/window/TaskOrganizerTaskEmbedder.java
View File

@@ -21,7 +21,6 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
import android.app.ActivityManager;
import android.app.ActivityOptions;
import android.app.ActivityView;
import android.app.TaskStackListener;
import android.content.Context;
import android.graphics.Rect;
@@ -55,11 +54,6 @@ public class TaskOrganizerTaskEmbedder extends TaskEmbedder {
super(context, host);
}
@Override
public TaskStackListener createTaskStackListener() {
return new TaskStackListenerImpl();
}
/**
* Whether this container has been initialized.
*
@@ -219,29 +213,6 @@ public class TaskOrganizerTaskEmbedder extends TaskEmbedder {
Log.d(TAG, "[" + System.identityHashCode(this) + "] " + msg);
}
/**
* A task change listener that detects background color change of the topmost stack on our
* virtual display and updates the background of the surface view. This background will be shown
* when surface view is resized, but the app hasn't drawn its content in new size yet.
* It also calls StateCallback.onTaskMovedToFront to notify interested parties that the stack
* associated with the {@link ActivityView} has had a Task moved to the front. This is useful
* when needing to also bring the host Activity to the foreground at the same time.
*/
private class TaskStackListenerImpl extends TaskStackListener {
@Override
public void onTaskDescriptionChanged(ActivityManager.RunningTaskInfo taskInfo) {
if (!isInitialized()) {
return;
}
if (taskInfo.taskId == mTaskInfo.taskId) {
mTaskInfo.taskDescription = taskInfo.taskDescription;
mHost.onTaskBackgroundColorChanged(TaskOrganizerTaskEmbedder.this,
taskInfo.taskDescription.getBackgroundColor());
}
}
}
private class TaskOrganizerImpl extends TaskOrganizer {
@Override
public void onTaskAppeared(ActivityManager.RunningTaskInfo taskInfo) {
@@ -249,7 +220,6 @@ public class TaskOrganizerTaskEmbedder extends TaskEmbedder {
log("taskAppeared: " + taskInfo.taskId);
}
// TODO: Ensure visibility/alpha of the leash in its initial state?
mTaskInfo = taskInfo;
mTaskToken = taskInfo.token;
mTaskLeash = mTaskToken.getLeash();
@@ -269,6 +239,13 @@ public class TaskOrganizerTaskEmbedder extends TaskEmbedder {
}
}
@Override
public void onTaskInfoChanged(ActivityManager.RunningTaskInfo taskInfo) {
mTaskInfo.taskDescription = taskInfo.taskDescription;
mHost.post(() -> mHost.onTaskBackgroundColorChanged(TaskOrganizerTaskEmbedder.this,
taskInfo.taskDescription.getBackgroundColor()));
}
@Override
public void onTaskVanished(ActivityManager.RunningTaskInfo taskInfo) {
if (DEBUG) {

18
core/java/android/window/VirtualDisplayTaskEmbedder.java
View File

@@ -67,6 +67,7 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder {
private VirtualDisplay mVirtualDisplay;
private Insets mForwardedInsets;
private DisplayMetrics mTmpDisplayMetrics;
private TaskStackListener mTaskStackListener;
/**
* Constructs a new TaskEmbedder.
@@ -82,11 +83,6 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder {
mSingleTaskInstance = singleTaskInstance;
}
@Override
public TaskStackListener createTaskStackListener() {
return new TaskStackListenerImpl();
}
/**
* Whether this container has been initialized.
*
@@ -124,6 +120,9 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder {
.setDisplayToSingleTaskInstance(displayId);
}
setForwardedInsets(mForwardedInsets);
mTaskStackListener = new TaskStackListenerImpl();
mActivityTaskManager.registerTaskStackListener(mTaskStackListener);
} catch (RemoteException e) {
e.rethrowAsRuntimeException();
}
@@ -142,6 +141,15 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder {
// Clear tap-exclude region (if any) for this window.
clearTapExcludeRegion();
if (mTaskStackListener != null) {
try {
mActivityTaskManager.unregisterTaskStackListener(mTaskStackListener);
} catch (RemoteException e) {
Log.e(TAG, "Failed to unregister task stack listener", e);
}
mTaskStackListener = null;
}
if (isInitialized()) {
mVirtualDisplay.release();
mVirtualDisplay = null;

13
core/java/android/window/WindowContainerToken.java
View File

@@ -84,4 +84,17 @@ public final class WindowContainerToken implements Parcelable {
public int describeContents() {
return 0;
}
@Override
public int hashCode() {
return mRealToken.asBinder().hashCode();
}
@Override
public boolean equals(Object obj) {
if (!(obj instanceof WindowContainerToken)) {
return false;
}
return mRealToken.asBinder() == ((WindowContainerToken) obj).asBinder();
}
}

4
packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java
View File

@@ -105,10 +105,6 @@ class SplitScreenTaskOrganizer extends TaskOrganizer {
mDivider.getHandler().post(() -> handleTaskInfoChanged(taskInfo));
}
@Override
public void onBackPressedOnTaskRoot(RunningTaskInfo taskInfo) {
}
/**
* This is effectively a finite state machine which moves between the various split-screen
* presentations based on the contents of the split regions.

1
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -5592,6 +5592,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
_taskDescription.setIconFilename(iconFilePath);
}
taskDescription = _taskDescription;
getTask().updateTaskDescription();
}
void setVoiceSessionLocked(IVoiceInteractionSession session) {

2
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -3061,8 +3061,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
ActivityRecord r = ActivityRecord.isInStackLocked(token);
if (r != null) {
r.setTaskDescription(td);
final Task task = r.getTask();
task.updateTaskDescription();
}
}
}

13
services/core/java/com/android/server/wm/Task.java
View File

@@ -1769,6 +1769,10 @@ class Task extends WindowContainer<WindowContainer> {
t.updateTaskDescription();
}
}
if (isOrganized()) {
mAtmService.mTaskOrganizerController.dispatchTaskInfoChanged(this, true /* force */);
}
}
private static boolean setTaskDescriptionFromActivityAboveRoot(
@@ -1964,7 +1968,7 @@ class Task extends WindowContainer<WindowContainer> {
final boolean taskOrgChanged = updateTaskOrganizerState(false /* forceUpdate */);
// If the task organizer has changed, then it will already be receiving taskAppeared with
// the latest task-info thus the task-info won't have changed.
if (!taskOrgChanged && mTaskOrganizer != null) {
if (!taskOrgChanged && isOrganized()) {
mAtmService.mTaskOrganizerController.dispatchTaskInfoChanged(this, false /* force */);
}
}
@@ -4173,8 +4177,6 @@ class Task extends WindowContainer<WindowContainer> {
// Let the old organizer know it has lost control.
sendTaskVanished();
mTaskOrganizer = organizer;
sendTaskAppeared();
onTaskOrganizerChanged();
return true;
@@ -4311,8 +4313,9 @@ class Task extends WindowContainer<WindowContainer> {
void setPictureInPictureParams(PictureInPictureParams p) {
mPictureInPictureParams.copyOnlySet(p);
mAtmService.mTaskOrganizerController.dispatchTaskInfoChanged(
this, true /* force */);
if (isOrganized()) {
mAtmService.mTaskOrganizerController.dispatchTaskInfoChanged(this, true /* force */);
}
}
/**

4
services/core/java/com/android/server/wm/TaskOrganizerController.java
View File

@@ -27,6 +27,7 @@ import static com.android.server.wm.WindowOrganizerController.CONTROLLABLE_WINDO
import android.annotation.Nullable;
import android.app.ActivityManager;
import android.app.ActivityManager.RunningTaskInfo;
import android.app.ActivityManager.TaskDescription;
import android.app.WindowConfiguration;
import android.content.Intent;
import android.content.pm.ActivityInfo;
@@ -439,7 +440,8 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub {
boolean changed = lastInfo == null
|| mTmpTaskInfo.topActivityType != lastInfo.topActivityType
|| mTmpTaskInfo.isResizable() != lastInfo.isResizable()
|| mTmpTaskInfo.pictureInPictureParams != lastInfo.pictureInPictureParams;
|| mTmpTaskInfo.pictureInPictureParams != lastInfo.pictureInPictureParams
|| !TaskDescription.equals(mTmpTaskInfo.taskDescription, lastInfo.taskDescription);
if (!changed) {
int cfgChanges = mTmpTaskInfo.configuration.diff(lastInfo.configuration);
final int winCfgChanges = (cfgChanges & ActivityInfo.CONFIG_WINDOW_CONFIGURATION) != 0

25
services/tests/wmtests/src/com/android/server/wm/TaskOrganizerTests.java
View File

@@ -50,6 +50,7 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import android.app.ActivityManager;
import android.app.ActivityManager.RunningTaskInfo;
import android.app.ActivityManager.StackInfo;
import android.app.IRequestFinishCallback;
@@ -855,6 +856,30 @@ public class TaskOrganizerTests extends WindowTestsBase {
assertEquals(4, ratio.getDenominator());
}
@Test
public void testChangeTaskDescription() {
class ChangeSavingOrganizer extends StubOrganizer {
RunningTaskInfo mChangedInfo;
@Override
public void onTaskInfoChanged(RunningTaskInfo info) {
mChangedInfo = info;
}
}
ChangeSavingOrganizer o = new ChangeSavingOrganizer();
mWm.mAtmService.mTaskOrganizerController.registerTaskOrganizer(o,
WINDOWING_MODE_MULTI_WINDOW);
final ActivityStack stack = createStack();
final Task task = createTask(stack);
final ActivityRecord record = WindowTestUtils.createActivityRecordInTask(
stack.mDisplayContent, task);
stack.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);
record.setTaskDescription(new ActivityManager.TaskDescription("TestDescription"));
waitUntilHandlersIdle();
assertEquals("TestDescription", o.mChangedInfo.taskDescription.getLabel());
}
@Test
public void testPreventDuplicateAppear() throws RemoteException {
final ActivityStack stack = createStack();