Unify Activity level of window hierarchy (50/n).
Make ActivityRecord extend AppWindowToken so we have a single object
for acitvities in the hierarchy.
Bug: 80414790
Test: Existing tests pass.
Change-Id: Ia7f52ef444cba88223f4e8a9586f6c12b1b5e4ea
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 468a13d..299ab8a 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -807,7 +807,7 @@
mUiHandler = new UiHandler();
mIntentFirewall = intentFirewall;
final File systemDir = SystemServiceManager.ensureSystemDir();
- mAppWarnings = new AppWarnings(this, mUiContext, mH, mUiHandler, systemDir);
+ mAppWarnings = createAppWarnings(mUiContext, mH, mUiHandler, systemDir);
mCompatModePackages = new CompatModePackages(this, systemDir, mH);
mPendingIntentController = intentController;
@@ -845,6 +845,11 @@
return supervisor;
}
+ protected AppWarnings createAppWarnings(
+ Context uiContext, Handler handler, Handler uiHandler, File systemDir) {
+ return new AppWarnings(this, uiContext, handler, uiHandler, systemDir);
+ }
+
public void setWindowManager(WindowManagerService wm) {
synchronized (mGlobalLock) {
mWindowManager = wm;
@@ -1813,11 +1818,9 @@
@Override
public int getRequestedOrientation(IBinder token) {
synchronized (mGlobalLock) {
- ActivityRecord r = ActivityRecord.isInStackLocked(token);
- if (r == null) {
- return ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
- }
- return r.getOrientation();
+ final ActivityRecord r = ActivityRecord.isInStackLocked(token);
+ return (r != null)
+ ? r.getRequestedOrientation() : ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
}
}