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

Commit 2e5528c5 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Revert ActivityManager changes for tasks. DO NOT MERGE" into jb-mr2-dev

parents 19a38f6f 2ad92075

core/java/android/view/IWindowManager.aidl

+3 −0
Original line number Diff line number Diff line
@@ -99,6 +99,9 @@ interface IWindowManager 
    void startAppFreezingScreen(IBinder token, int configChanges);

    void stopAppFreezingScreen(IBinder token, boolean force);

    void removeAppToken(IBinder token);

    void moveAppToken(int index, IBinder token);

    void moveAppTokensToTop(in List<IBinder> tokens);

    void moveAppTokensToBottom(in List<IBinder> tokens);



    // Re-evaluate the current orientation from the caller's state.

    // If there is a change, the new Configuration is returned and the

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

+365 −42

File changed.

Preview size limit exceeded, changes collapsed.

services/java/com/android/server/am/ActivityRecord.java

+3 −9

File changed.

Preview size limit exceeded, changes collapsed.

services/java/com/android/server/am/ActivityStack.java

+93 −831

File changed.

Preview size limit exceeded, changes collapsed.

services/java/com/android/server/am/CompatModePackages.java

+14 −2
Original line number Diff line number Diff line
@@ -295,8 +295,20 @@ public class CompatModePackages { 
            Message msg = mHandler.obtainMessage(MSG_WRITE);

            mHandler.sendMessageDelayed(msg, 10000);



            ActivityRecord starting = mService.mMainStack.topRunningActivityLocked(null);



            ActivityRecord starting = mService.mMainStack.restartPackage(packageName);

            // All activities that came from the package must be

            // restarted as if there was a config change.

            for (int i=mService.mMainStack.mHistory.size()-1; i>=0; i--) {

                ActivityRecord a = (ActivityRecord)mService.mMainStack.mHistory.get(i);

                if (a.info.packageName.equals(packageName)) {

                    a.forceNewConfig = true;

                    if (starting != null && a == starting && a.visible) {

                        a.startFreezingScreenLocked(starting.app,

                                ActivityInfo.CONFIG_SCREEN_LAYOUT);

                    }

                }

            }



            // Tell all processes that loaded this package about the change.

            for (int i=mService.mLruProcesses.size()-1; i>=0; i--) {