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

Commit 07f941f0 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Move BroadcastQueue out of the ActivityManager class."

parents 95d4c993 40c8db5a

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

+12 −964

File changed.

Preview size limit exceeded, changes collapsed.

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

+7 −7
Original line number Original line Diff line number Diff line
@@ -283,13 +283,13 @@ final class ActivityStack { 




    private int mCurrentUser;

    private int mCurrentUser;





    static final int SLEEP_TIMEOUT_MSG = 8;

    static final int SLEEP_TIMEOUT_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG;

    static final int PAUSE_TIMEOUT_MSG = 9;

    static final int PAUSE_TIMEOUT_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 1;

    static final int IDLE_TIMEOUT_MSG = 10;

    static final int IDLE_TIMEOUT_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 2;

    static final int IDLE_NOW_MSG = 11;

    static final int IDLE_NOW_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 3;

    static final int LAUNCH_TIMEOUT_MSG = 16;

    static final int LAUNCH_TIMEOUT_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 4;

    static final int DESTROY_TIMEOUT_MSG = 17;

    static final int DESTROY_TIMEOUT_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 5;

    static final int RESUME_TOP_ACTIVITY_MSG = 19;

    static final int RESUME_TOP_ACTIVITY_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 6;

    

    

    final Handler mHandler = new Handler() {

    final Handler mHandler = new Handler() {

        //public Handler() {

        //public Handler() {

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

0 → 100644
+1017 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ class BroadcastRecord extends Binder { 
    IBinder receiver;       // who is currently running, null if none.

    IBinder receiver;       // who is currently running, null if none.

    int state;

    int state;

    int anrCount;           // has this broadcast record hit any ANRs?

    int anrCount;           // has this broadcast record hit any ANRs?

    ActivityManagerService.BroadcastQueue queue;   // the outbound queue handling this broadcast

    BroadcastQueue queue;   // the outbound queue handling this broadcast





    static final int IDLE = 0;

    static final int IDLE = 0;

    static final int APP_RECEIVE = 1;

    static final int APP_RECEIVE = 1;
@@ -162,7 +162,7 @@ class BroadcastRecord extends Binder { 
        }

        }

    }

    }





    BroadcastRecord(ActivityManagerService.BroadcastQueue _queue,

    BroadcastRecord(BroadcastQueue _queue,

            Intent _intent, ProcessRecord _callerApp, String _callerPackage,

            Intent _intent, ProcessRecord _callerApp, String _callerPackage,

            int _callingPid, int _callingUid, String _requiredPermission,

            int _callingPid, int _callingUid, String _requiredPermission,

            List _receivers, IIntentReceiver _resultTo, int _resultCode,

            List _receivers, IIntentReceiver _resultTo, int _resultCode,

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ public class CompatModePackages { 




    private final HashMap<String, Integer> mPackages = new HashMap<String, Integer>();

    private final HashMap<String, Integer> mPackages = new HashMap<String, Integer>();





    private static final int MSG_WRITE = 1;

    private static final int MSG_WRITE = ActivityManagerService.FIRST_COMPAT_MODE_MSG;





    private final Handler mHandler = new Handler() {

    private final Handler mHandler = new Handler() {

        @Override public void handleMessage(Message msg) {

        @Override public void handleMessage(Message msg) {