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

Commit fab85f0f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ide697f9f,Ia76c5741 

* changes:
  Moved AppWarnings handling to ActivityTaskManagerService (15/n)
  Moved input time out handling to ActivityTaskManagerService (14/n)
parents a1b12c82 008163e7

core/java/android/app/ActivityManagerInternal.java

+3 −0
Original line number Diff line number Diff line
@@ -228,4 +228,7 @@ public abstract class ActivityManagerInternal { 
    public abstract boolean isCurrentProfile(int userId);

    public abstract boolean hasStartedUserState(int userId);

    public abstract void finishUserSwitch(Object uss);



    /** Schedule the execution of all pending app GCs. */

    public abstract void scheduleAppGcs();

}

core/java/android/app/IActivityManager.aidl

+0 −1
Original line number Diff line number Diff line
@@ -325,7 +325,6 @@ interface IActivityManager { 
     */

    void requestWifiBugReport(in String shareTitle, in String shareDescription);



    long inputDispatchingTimedOut(int pid, boolean aboveSystem, in String reason);

    void clearPendingBackup();

    Intent getIntentForIntentSender(in IIntentSender sender);

    // This is not public because you need to be very careful in how you

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

+1 −1
Original line number Diff line number Diff line
@@ -3658,7 +3658,7 @@ public final class ActiveServices { 
            }



            app = r.app;

            if (app != null && app.debugging) {

            if (app != null && app.isDebugging()) {

                // The app's being debugged; let it ride

                return;

            }

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

+96 −196

File changed.

Preview size limit exceeded, changes collapsed.

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

+9 −9

File changed.

Preview size limit exceeded, changes collapsed.