Merge tag 'android-13.0.0_r32' into int/13/fp3
Android 13.0.0 release 32
* tag 'android-13.0.0_r32':
Let setPersistentActivity() fail if it can't find the display
Change-Id: I52b0a922e9b13e487d994995408b9a242f9e084b
diff --git a/builtInServices/src/com/android/server/wm/CarLaunchParamsModifier.java b/builtInServices/src/com/android/server/wm/CarLaunchParamsModifier.java
index 6472ffb..a7bdb4c 100644
--- a/builtInServices/src/com/android/server/wm/CarLaunchParamsModifier.java
+++ b/builtInServices/src/com/android/server/wm/CarLaunchParamsModifier.java
@@ -188,7 +188,7 @@
@Nullable
private TaskDisplayAreaWrapper findTaskDisplayArea(int displayId, int featureId) {
- DisplayContent display = mAtm.mRootWindowContainer.getDisplayContentOrCreate(displayId);
+ DisplayContent display = mAtm.mRootWindowContainer.getDisplayContent(displayId);
if (display == null) {
return null;
}
diff --git a/updatableServices/src/com/android/server/wm/CarLaunchParamsModifierUpdatableImpl.java b/updatableServices/src/com/android/server/wm/CarLaunchParamsModifierUpdatableImpl.java
index d836c03..03933b4 100644
--- a/updatableServices/src/com/android/server/wm/CarLaunchParamsModifierUpdatableImpl.java
+++ b/updatableServices/src/com/android/server/wm/CarLaunchParamsModifierUpdatableImpl.java
@@ -272,11 +272,11 @@
TaskDisplayAreaWrapper originalDisplayArea = currentParams.getPreferredTaskDisplayArea();
// DisplayArea where CarLaunchParamsModifier targets to launch the Activity.
TaskDisplayAreaWrapper targetDisplayArea = null;
- if (DBG) {
- Slogf.d(TAG, "onCalculate, userId:%d original displayArea:%s ActivityOptions:%s",
- userId, originalDisplayArea, options);
- }
ComponentName activityName = activity.getComponentName();
+ if (DBG) {
+ Slogf.d(TAG, "onCalculate, userId:%d original displayArea:%s actvity:%s options:%s",
+ userId, originalDisplayArea, activityName, options);
+ }
decision:
synchronized (mLock) {
// If originalDisplayArea is set, respect that before ActivityOptions check.
@@ -350,7 +350,7 @@
}
if (targetDisplayArea != null && originalDisplayArea != targetDisplayArea) {
Slogf.i(TAG, "Changed launching display, user:%d requested display area:%s"
- + " target display area:", userId, originalDisplayArea, targetDisplayArea);
+ + " target display area:%s", userId, originalDisplayArea, targetDisplayArea);
outParams.setPreferredTaskDisplayArea(targetDisplayArea);
return LaunchParamsWrapper.RESULT_DONE;
} else {