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

Merge "Ensure child task has activity type set" into tm-qpr-dev

Browse Source
This commit is contained in:
Louis Chang
2023-03-13 13:14:36 +00:00
committed by Android (Google) Code Review
parent d79d644ac3 f920308224
commit 54115fb7c9
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8945,6 +8945,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
final boolean wasInPictureInPicture = inPinnedWindowingMode(); final boolean wasInPictureInPicture = inPinnedWindowingMode();
final DisplayContent display = mDisplayContent; final DisplayContent display = mDisplayContent;
final int activityType = getActivityType();
if (wasInPictureInPicture && attachedToProcess() && display != null) { if (wasInPictureInPicture && attachedToProcess() && display != null) {
// If the PIP activity is changing to fullscreen with display orientation change, the // If the PIP activity is changing to fullscreen with display orientation change, the
// fixed rotation will take effect that requires to send fixed rotation adjustments // fixed rotation will take effect that requires to send fixed rotation adjustments
@@ -8969,6 +8970,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
} else { } else {
super.onConfigurationChanged(newParentConfig); super.onConfigurationChanged(newParentConfig);
} }
if (activityType != ACTIVITY_TYPE_UNDEFINED
&& activityType != getActivityType()) {
Slog.w(TAG, "Can't change activity type once set: " + this
+ " activityType=" + activityTypeToString(getActivityType()));
}
// Configuration's equality doesn't consider seq so if only seq number changes in resolved // Configuration's equality doesn't consider seq so if only seq number changes in resolved
// override configuration. Therefore ConfigurationContainer doesn't change merged override // override configuration. Therefore ConfigurationContainer doesn't change merged override

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

@@ -5884,8 +5884,11 @@ class Task extends TaskFragment {
final int taskId = activity != null final int taskId = activity != null
? mTaskSupervisor.getNextTaskIdForUser(activity.mUserId) ? mTaskSupervisor.getNextTaskIdForUser(activity.mUserId)
: mTaskSupervisor.getNextTaskIdForUser(); : mTaskSupervisor.getNextTaskIdForUser();
final int activityType = getActivityType();
task = new Task.Builder(mAtmService) task = new Task.Builder(mAtmService)
.setTaskId(taskId) .setTaskId(taskId)
.setActivityType(activityType != ACTIVITY_TYPE_UNDEFINED ? activityType
: ACTIVITY_TYPE_STANDARD)
.setActivityInfo(info) .setActivityInfo(info)
.setActivityOptions(options) .setActivityOptions(options)
.setIntent(intent) .setIntent(intent)