diff options
| author | 2024-09-09 09:00:04 +0000 | |
|---|---|---|
| committer | 2024-09-09 09:00:04 +0000 | |
| commit | d6f61590c35d1a780c0829e67ca60661727b2f8c (patch) | |
| tree | d8b0f6bcc29863deea8cc0921cef3dbb1bd73f7e | |
| parent | 92eb95d4ebca8cac1a92c87e58a3be48bab36036 (diff) | |
| parent | f52cdce1aca3e1eb6c64605affa1a328a3929aed (diff) | |
Merge "Exclude game apps from orientation experiment" into main
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerConstants.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 99747e05e7f0..0be6471f189e 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -8149,7 +8149,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A */ @Override protected int getOverrideOrientation() { - if (mWmService.mConstants.mIgnoreActivityOrientationRequest) { + if (mWmService.mConstants.mIgnoreActivityOrientationRequest + && info.applicationInfo.category != ApplicationInfo.CATEGORY_GAME) { return ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; } return mAppCompatController.getOrientationPolicy() diff --git a/services/core/java/com/android/server/wm/WindowManagerConstants.java b/services/core/java/com/android/server/wm/WindowManagerConstants.java index 47c42f4292f1..e0f24d8bf447 100644 --- a/services/core/java/com/android/server/wm/WindowManagerConstants.java +++ b/services/core/java/com/android/server/wm/WindowManagerConstants.java @@ -34,7 +34,7 @@ import java.util.concurrent.Executor; */ final class WindowManagerConstants { - /** The orientation of activity will be always "unspecified". */ + /** The orientation of activity will be always "unspecified" except for game apps. */ private static final String KEY_IGNORE_ACTIVITY_ORIENTATION_REQUEST = "ignore_activity_orientation_request"; |