Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a1860a9 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Unify WM test setup for system services (47/n) 

Needed before we can unify objects in hierarchy.

Bug: 80414790
Bug: 122846381
Test: Existing test pass
Change-Id: Ib3bca1f7ad2b15b5426d198d3c5608e3cba640f7
parent 06358084

services/core/java/com/android/server/am/ActivityManagerService.java

+6 −2
Original line number Diff line number Diff line
@@ -1480,8 +1480,9 @@ public class ActivityManagerService extends IActivityManager.Stub 
    public ActivityTaskManagerService mActivityTaskManager;

    @VisibleForTesting

    public ActivityTaskManagerInternal mAtmInternal;

    UriGrantsManagerInternal mUgmInternal;

    @VisibleForTesting

    public UriGrantsManagerInternal mUgmInternal;

    public final ActivityManagerInternal mInternal;

    final ActivityThread mSystemThread;















    private final class AppDeathRecipient implements IBinder.DeathRecipient {










@@ -2413,6 +2414,8 @@ public class ActivityManagerService extends IActivityManager.Stub













        mProcStartHandler = null;















        mHiddenApiBlacklist = null;















        mFactoryTest = FACTORY_TEST_OFF;













        mUgmInternal = LocalServices.getService(UriGrantsManagerInternal.class);













        mInternal = new LocalService();















    }





























    // Note: This method is invoked on the main thread but may need to attach various










@@ -2566,6 +2569,7 @@ public class ActivityManagerService extends IActivityManager.Stub













            Slog.w(TAG, "Setting background thread cpuset failed");















        }



























        mInternal = new LocalService();















    }





























    public void setSystemServiceManager(SystemServiceManager mgr) {









@@ -2583,7 +2587,7 @@ public class ActivityManagerService extends IActivityManager.Stub













        mBatteryStatsService.publish();















        mAppOpsService.publish(mContext);















        Slog.d("AppOps", "AppOpsService published");













        LocalServices.addService(ActivityManagerInternal.class, new LocalService());













        LocalServices.addService(ActivityManagerInternal.class, mInternal);















        mActivityTaskManager.onActivityManagerInternalAdded();















        mUgmInternal.onActivityManagerInternalAdded();















        mPendingIntentController.onActivityManagerInternalAdded();

































services/core/java/com/android/server/wm/ActivityDisplay.java



+17
−12




























Original line number
Diff line number
Diff line








@@ -41,6 +41,7 @@ import static com.android.server.am.ActivityDisplayProto.RESUMED_ACTIVITY;













import static com.android.server.am.ActivityDisplayProto.SINGLE_TASK_INSTANCE;















import static com.android.server.am.ActivityDisplayProto.STACKS;















import static com.android.server.wm.ActivityStack.ActivityState.RESUMED;













import static com.android.server.wm.ActivityStack.REMOVE_TASK_MODE_DESTROYING;















import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_VISIBLE;















import static com.android.server.wm.ActivityStackSupervisor.TAG_TASKS;















import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_STACK;










@@ -173,18 +174,10 @@ class ActivityDisplay extends ConfigurationContainer<ActivityStack>













        mService = root.mService;















        mDisplayId = display.getDisplayId();















        mDisplay = display;













        mDisplayContent = createDisplayContent();













        mDisplayContent = mService.mWindowManager.mRoot.createDisplayContent(mDisplay, this);















        mDisplayContent.reconfigureDisplayLocked();













        updateBounds();













    }



























    protected DisplayContent createDisplayContent() {













        return mService.mWindowManager.mRoot.createDisplayContent(mDisplay, this);













    }



























    private void updateBounds() {













        mDisplay.getRealSize(mTmpDisplaySize);













        setBounds(0, 0, mTmpDisplaySize.x, mTmpDisplaySize.y);













        onRequestedOverrideConfigurationChanged(













                mDisplayContent.getRequestedOverrideConfiguration());















    }































    void onDisplayChanged() {









@@ -200,7 +193,8 @@ class ActivityDisplay extends ConfigurationContainer<ActivityStack>













            }















        }





























        updateBounds();













        mDisplay.getRealSize(mTmpDisplaySize);













        setBounds(0, 0, mTmpDisplaySize.x, mTmpDisplaySize.y);















        if (mDisplayContent != null) {















            mDisplayContent.updateDisplayInfo();















            mService.mWindowManager.requestTraversal();










@@ -1541,6 +1535,17 @@ class ActivityDisplay extends ConfigurationContainer<ActivityStack>













        return mSingleTaskInstance;















    }





























    @VisibleForTesting













    void removeAllTasks() {













        for (int i = getChildCount() - 1; i >= 0; --i) {













            final ActivityStack stack = getChildAt(i);













            final ArrayList<TaskRecord> tasks = stack.getAllTasks();













            for (int j = tasks.size() - 1; j >= 0; --j) {













                stack.removeTask(tasks.get(j), "removeAllTasks", REMOVE_TASK_MODE_DESTROYING);













            }













        }













    }





























    public void dump(PrintWriter pw, String prefix) {















        pw.println(prefix + "displayId=" + mDisplayId + " stacks=" + mStacks.size()















                + (mSingleTaskInstance ? " mSingleTaskInstance" : ""));

































services/core/java/com/android/server/wm/ActivityStack.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -2813,7 +2813,7 @@ class ActivityStack extends ConfigurationContainer {













        // Launching this app's activity, make sure the app is no longer















        // considered stopped.















        try {













            AppGlobals.getPackageManager().setPackageStoppedState(













            mService.getPackageManager().setPackageStoppedState(















                    next.packageName, false, next.mUserId); /* TODO: Verify if correct userid */















        } catch (RemoteException e1) {















        } catch (IllegalArgumentException e) {

































services/core/java/com/android/server/wm/ActivityStackSupervisor.java



+11
−4




























Original line number
Diff line number
Diff line








@@ -250,7 +250,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {













    RecentTasks mRecentTasks;































    /** Helper class to abstract out logic for fetching the set of currently running tasks */













    RunningTasks mRunningTasks;













    private RunningTasks mRunningTasks;































    final ActivityStackSupervisorHandler mHandler;















    final Looper mLooper;










@@ -444,7 +444,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {













        }































        mInitialized = true;













        mRunningTasks = createRunningTasks();













        setRunningTasks(new RunningTasks());































        mActivityMetricsLogger = new ActivityMetricsLogger(this, mService.mContext,















                mHandler.getLooper());










@@ -485,13 +485,20 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {













    }































    void setRecentTasks(RecentTasks recentTasks) {













        if (mRecentTasks != null) {













            mRecentTasks.unregisterCallback(this);













        }















        mRecentTasks = recentTasks;















        mRecentTasks.registerCallback(this);















    }































    @VisibleForTesting













    RunningTasks createRunningTasks() {













        return new RunningTasks();













    void setRunningTasks(RunningTasks runningTasks) {













        mRunningTasks = runningTasks;













    }



























    RunningTasks getRunningTasks() {













        return mRunningTasks;















    }































    /**

































services/core/java/com/android/server/wm/ActivityTaskManagerService.java



+6
−11




























Original line number
Diff line number
Diff line








@@ -43,7 +43,6 @@ import static android.content.pm.ApplicationInfo.FLAG_FACTORY_TEST;













import static android.content.pm.ConfigurationInfo.GL_ES_VERSION_UNDEFINED;















import static android.content.pm.PackageManager.FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS;















import static android.content.pm.PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT;













import static android.content.pm.PackageManager.FEATURE_PC;















import static android.content.pm.PackageManager.FEATURE_PICTURE_IN_PICTURE;















import static android.content.pm.PackageManager.PERMISSION_GRANTED;















import static android.content.res.Configuration.UI_MODE_TYPE_TELEVISION;










@@ -361,7 +360,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {













    /* Global service lock used by the package the owns this service. */















    final WindowManagerGlobalLock mGlobalLock = new WindowManagerGlobalLock();















    /**













     * It is the same instance as {@link mGlobalLock}, just declared as a type that the













     * It is the same instance as {@link #mGlobalLock}, just declared as a type that the















     * locked-region-code-injection does't recognize it. It is used to skip wrapping priority















     * booster for places that are already in the scope of another booster (e.g. computing oom-adj).















     *










@@ -730,7 +729,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {













        final boolean forceRtl = Settings.Global.getInt(resolver, DEVELOPMENT_FORCE_RTL, 0) != 0;















        final boolean forceResizable = Settings.Global.getInt(















                resolver, DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, 0) != 0;













        final boolean isPc = mContext.getPackageManager().hasSystemFeature(FEATURE_PC);































        // Transfer any global setting for forcing RTL layout, into a System Property















        DisplayProperties.debug_force_rtl(forceRtl);










@@ -761,10 +759,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {













                mSupportsPictureInPicture = false;















                mSupportsMultiDisplay = false;















            }













            mWindowManager.setForceResizableTasks(mForceResizableActivities);













            mWindowManager.setSupportsPictureInPicture(mSupportsPictureInPicture);













            mWindowManager.setSupportsFreeformWindowManagement(mSupportsFreeformWindowManagement);













            mWindowManager.setIsPc(isPc);















            mWindowManager.mRoot.onSettingsRetrieved();















            // This happens before any activities are started, so we can change global configuration















            // in-place.










@@ -821,8 +815,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {













                new TaskChangeNotificationController(mGlobalLock, mStackSupervisor, mH);















        mLockTaskController = new LockTaskController(mContext, mStackSupervisor, mH);















        mActivityStartController = new ActivityStartController(this);













        mRecentTasks = createRecentTasks();













        mStackSupervisor.setRecentTasks(mRecentTasks);













        setRecentTasks(new RecentTasks(this, mStackSupervisor));















        mVrController = new VrController(mGlobalLock);















        mKeyguardController = mStackSupervisor.getKeyguardController();















    }










@@ -890,8 +883,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {













        return mode == AppOpsManager.MODE_ALLOWED;















    }





























    protected RecentTasks createRecentTasks() {













        return new RecentTasks(this, mStackSupervisor);













    @VisibleForTesting













    protected void setRecentTasks(RecentTasks recentTasks) {













        mRecentTasks = recentTasks;













        mStackSupervisor.setRecentTasks(recentTasks);















    }































    RecentTasks getRecentTasks() {