diff options
5 files changed, 5 insertions, 12 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 745d41dd0d3d..b71256d27a14 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -3227,7 +3227,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A return false; } // If the user preference respects aspect ratio, then it becomes non-resizable. - return mAppCompatController.getAppCompatOverrides().getAppCompatAspectRatioOverrides() + return mAppCompatController.getAppCompatAspectRatioOverrides() .userPreferenceCompatibleWithNonResizability(); } diff --git a/services/core/java/com/android/server/wm/ActivityRefresher.java b/services/core/java/com/android/server/wm/ActivityRefresher.java index ed8b6890b2d3..597f75a52f1c 100644 --- a/services/core/java/com/android/server/wm/ActivityRefresher.java +++ b/services/core/java/com/android/server/wm/ActivityRefresher.java @@ -115,8 +115,8 @@ class ActivityRefresher { private boolean shouldRefreshActivity(@NonNull ActivityRecord activity, @NonNull Configuration newConfig, @NonNull Configuration lastReportedConfig) { return mWmService.mAppCompatConfiguration.isCameraCompatRefreshEnabled() - && activity.mAppCompatController.getAppCompatOverrides() - .getAppCompatCameraOverrides().shouldRefreshActivityForCameraCompat() + && activity.mAppCompatController.getAppCompatCameraOverrides() + .shouldRefreshActivityForCameraCompat() && ArrayUtils.find(mEvaluators.toArray(), evaluator -> ((Evaluator) evaluator) .shouldRefreshActivity(activity, newConfig, lastReportedConfig)) != null; diff --git a/services/core/java/com/android/server/wm/AppCompatController.java b/services/core/java/com/android/server/wm/AppCompatController.java index 330283fb9ab3..4433d64f0d00 100644 --- a/services/core/java/com/android/server/wm/AppCompatController.java +++ b/services/core/java/com/android/server/wm/AppCompatController.java @@ -123,11 +123,6 @@ class AppCompatController { } @NonNull - AppCompatOverrides getAppCompatOverrides() { - return mAppCompatOverrides; - } - - @NonNull AppCompatOrientationOverrides getAppCompatOrientationOverrides() { return mAppCompatOverrides.getAppCompatOrientationOverrides(); } diff --git a/services/tests/wmtests/src/com/android/server/wm/AppCompatOrientationOverridesTest.java b/services/tests/wmtests/src/com/android/server/wm/AppCompatOrientationOverridesTest.java index 8747cfae93f8..9d191cea8acb 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppCompatOrientationOverridesTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppCompatOrientationOverridesTest.java @@ -335,8 +335,7 @@ public class AppCompatOrientationOverridesTest extends WindowTestsBase { } private AppCompatOrientationOverrides getTopOrientationOverrides() { - return activity().top().mAppCompatController.getAppCompatOverrides() - .getAppCompatOrientationOverrides(); + return activity().top().mAppCompatController.getAppCompatOrientationOverrides(); } } } diff --git a/services/tests/wmtests/src/com/android/server/wm/AppCompatOrientationPolicyTest.java b/services/tests/wmtests/src/com/android/server/wm/AppCompatOrientationPolicyTest.java index 90bf5f03bb1f..a21ab5de5de2 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppCompatOrientationPolicyTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppCompatOrientationPolicyTest.java @@ -601,8 +601,7 @@ public class AppCompatOrientationPolicyTest extends WindowTestsBase { } private AppCompatOrientationOverrides getTopOrientationOverrides() { - return activity().top().mAppCompatController.getAppCompatOverrides() - .getAppCompatOrientationOverrides(); + return activity().top().mAppCompatController.getAppCompatOrientationOverrides(); } private AppCompatOrientationPolicy getTopAppCompatOrientationPolicy() { |