From 0be7013a944c98fcb50e42c79ef4934e196ea497 Mon Sep 17 00:00:00 2001 From: Riddle Hsu Date: Tue, 6 Jun 2023 14:05:22 +0000 Subject: [PATCH] Remove unnecessary invocation of updateRotation mMultiuserReceiver#onReceive will call mSettingsObserver.onChange. But both mSettingsObserver#updateSettings and mDefaultDisplayRotation.onUserSwitch() in mMultiuserReceiver#onReceive already check if there is something needs to update rotation. So it is unnecessary to call updateRotation again in mSettingsObserver.onChange. Cherry picked Ic201f319739e910bfb7bf4c9c55a9d687b35cb78 to master due to b/286408867. Code was merged via `-s ours` and is missing even though the sha exists on the target branch. Cherry pick is required to bring in the code. Manually remove the "Merged in" directive to allow for downstream propagation. Bug: 197745994 Test: Switch user (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a1c3f60121762a349e802011c764ebaa3b019b1b) Change-Id: If93b63417b526d8774b10f263eb4c4810a70cabe --- .../core/java/com/android/server/policy/PhoneWindowManager.java | 1 - 1 file changed, 1 deletion(-) diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index adb941a584681..a0756555fc74c 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -826,7 +826,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { @Override public void onChange(boolean selfChange) { updateSettings(); - updateRotation(false); } }