diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-12-20 00:31:07 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-12-20 00:31:07 +0000 |
commit | fcfe306c17dab8e592565bc5856e87154b35b3fa (patch) | |
tree | 0fdf70f3fa848332d0677ee80acf42509c346614 | |
parent | 99bb936d866f58d48a5981a31c1d32089288209f (diff) | |
parent | 136496079aaf1fac10d2b499dad06009518aa6ab (diff) | |
download | services-android13-qpr2-release.tar.gz |
Snap for 9420665 from 136496079aaf1fac10d2b499dad06009518aa6ab to tm-qpr2-releaseandroid-13.0.0_r49android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-release
Change-Id: If5208010ddf00ab67042bed5b61977e148b9d50c
-rw-r--r-- | builtInServices/src/com/android/server/wm/CarLaunchParamsModifier.java | 2 | ||||
-rw-r--r-- | updatableServices/src/com/android/server/wm/CarLaunchParamsModifierUpdatableImpl.java | 8 |
2 files changed, 5 insertions, 5 deletions
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 @@ public final class CarLaunchParamsModifier implements LaunchParamsController.Lau @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 @@ public final class CarLaunchParamsModifierUpdatableImpl TaskDisplayAreaWrapper originalDisplayArea = currentParams.getPreferredTaskDisplayArea(); // DisplayArea where CarLaunchParamsModifier targets to launch the Activity. TaskDisplayAreaWrapper targetDisplayArea = null; + ComponentName activityName = activity.getComponentName(); if (DBG) { - Slogf.d(TAG, "onCalculate, userId:%d original displayArea:%s ActivityOptions:%s", - userId, originalDisplayArea, options); + Slogf.d(TAG, "onCalculate, userId:%d original displayArea:%s actvity:%s options:%s", + userId, originalDisplayArea, activityName, options); } - ComponentName activityName = activity.getComponentName(); decision: synchronized (mLock) { // If originalDisplayArea is set, respect that before ActivityOptions check. @@ -350,7 +350,7 @@ public final class CarLaunchParamsModifierUpdatableImpl } 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 { |