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

Move TaskInfo comparison from TaskOrganizerController to TaskInfo

Browse Source 
Bug: 170216257
Test: atest WMShellUnitTests
Change-Id: I7ef6913172f57fbfad116a04e9e324ed9dc6535a
This commit is contained in:
Mariia Sandrikova
2020-11-18 16:47:05 +00:00
parent ebaa18e292
commit 1b44edeea9
2 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/java/android/app/TaskInfo.java
View File

@@ -36,6 +36,7 @@ import android.util.Log;
import android.window.WindowContainerToken;
import java.util.ArrayList;
import java.util.Objects;
/**
* Stores information about a particular Task.
@@ -287,6 +288,36 @@ public class TaskInfo {
return parentTaskId != INVALID_TASK_ID;
}
/**
* Returns {@code true} if parameters that are important for task organizers have changed
* and {@link com.android.server.wm.TaskOrginizerController} needs to notify listeners
* about that.
* @hide
*/
public boolean equalsForTaskOrganizer(@Nullable TaskInfo that) {
if (that == null) {
return false;
}
return topActivityType == that.topActivityType
&& isResizeable == that.isResizeable
&& Objects.equals(positionInParent, that.positionInParent)
&& equalsLetterboxParams(that)
&& pictureInPictureParams == that.pictureInPictureParams
&& getWindowingMode() == that.getWindowingMode()
&& Objects.equals(taskDescription, that.taskDescription);
}
private boolean equalsLetterboxParams(TaskInfo that) {
return Objects.equals(letterboxActivityBounds, that.letterboxActivityBounds)
&& Objects.equals(
getConfiguration().windowConfiguration.getBounds(),
that.getConfiguration().windowConfiguration.getBounds())
&& Objects.equals(
getConfiguration().windowConfiguration.getMaxBounds(),
that.getConfiguration().windowConfiguration.getMaxBounds())
&& Objects.equals(parentBounds, that.parentBounds);
}
/**
* Reads the TaskInfo from a parcel.
*/

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

@@ -27,7 +27,6 @@ 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;
@@ -52,7 +51,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
import java.util.WeakHashMap;
import java.util.function.Consumer;
@@ -538,16 +536,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub {
}
mTmpTaskInfo.configuration.unset();
task.fillTaskInfo(mTmpTaskInfo);
boolean changed = lastInfo == null
|| mTmpTaskInfo.topActivityType != lastInfo.topActivityType
|| mTmpTaskInfo.isResizeable != lastInfo.isResizeable
|| !Objects.equals(
mTmpTaskInfo.positionInParent,
lastInfo.positionInParent)
|| isLetterboxInfoChanged(lastInfo, mTmpTaskInfo)
|| mTmpTaskInfo.pictureInPictureParams != lastInfo.pictureInPictureParams
|| mTmpTaskInfo.getWindowingMode() != lastInfo.getWindowingMode()
|| !TaskDescription.equals(mTmpTaskInfo.taskDescription, lastInfo.taskDescription);
boolean changed = !mTmpTaskInfo.equalsForTaskOrganizer(lastInfo);
if (!changed) {
int cfgChanges = mTmpTaskInfo.configuration.diff(lastInfo.configuration);
final int winCfgChanges = (cfgChanges & ActivityInfo.CONFIG_WINDOW_CONFIGURATION) != 0
@@ -582,20 +571,6 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub {
}
}
private boolean isLetterboxInfoChanged(
final RunningTaskInfo lastInfo, final RunningTaskInfo currentInfo) {
return !Objects.equals(
currentInfo.letterboxActivityBounds,
lastInfo.letterboxActivityBounds)
|| !Objects.equals(
currentInfo.getConfiguration().windowConfiguration.getBounds(),
lastInfo.getConfiguration().windowConfiguration.getBounds())
|| !Objects.equals(
currentInfo.getConfiguration().windowConfiguration.getMaxBounds(),
lastInfo.getConfiguration().windowConfiguration.getMaxBounds())
|| !Objects.equals(currentInfo.parentBounds, lastInfo.parentBounds);
}
@Override
public WindowContainerToken getImeTarget(int displayId) {
enforceTaskPermission("getImeTarget()");