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

Commit 2ad92075 authored by Craig Mautner's avatar Craig Mautner
Browse files

Revert ActivityManager changes for tasks. DO NOT MERGE 

Keeping all activity=>task changes in master and removing them
from jb-mr2.

Revert "Update histories simultaneously."
Revert "Add null check to setAppGroupId."
Revert "Fix crashing bug in validator."
Revert "Switch topRunning* and moveTaskTo*"
Revert "Begin switch over to task based history."
Revert "Reset and reuse Iterators and don't new() one."
Revert "Remove AppWindowToken lists."
Revert "Fix build."
Revert "Remove unused App methods."
Revert "Stop using AppToken movement and start using Task."
Revert "Replace access to mAppTokens with AppTokenIterator"
Revert "Refactor setAppOpVisibility implementation."
Revert "Add AppWindowTokens to TaskList."
Revert "Make ActivityStack.mHistory private."
Revert "Migrate AppWindowToken lists into DisplayContent."

Change-Id: I5722c9a4956dccb52864207e2967690bc58e4ebb
parent ff4fcdb9

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--) {