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

Commit 456a1b41 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge changes from topic "oct28" 

* changes:
  BroadcastQueue: fix subtle resultTo bugs.
  BroadcastQueue: fix subtle OOM adjustment bug.
parents 51ad0567 3c265597

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

+14 −7
Original line number Diff line number Diff line
@@ -412,21 +412,24 @@ class BroadcastQueueModernImpl extends BroadcastQueue { 
            queue.runningTraceTrackName = TAG + ".mRunning[" + queueIndex + "]";

            queue.runningOomAdjusted = queue.isPendingManifest();



            // If already warm, we can make OOM adjust request immediately;

            // otherwise we need to wait until process becomes warm

            if (processWarm) {

                notifyStartedRunning(queue);

                updateOomAdj |= queue.runningOomAdjusted;

            }



            // If we're already warm, schedule next pending broadcast now;

            // otherwise we'll wait for the cold start to circle back around

            queue.makeActiveNextPending();

            if (processWarm) {

                queue.traceProcessRunningBegin();

                notifyStartedRunning(queue);

                scheduleReceiverWarmLocked(queue);

            } else {

                queue.traceProcessStartingBegin();

                scheduleReceiverColdLocked(queue);

            }



            // Only kick off an OOM adjustment pass if needed

            updateOomAdj |= queue.runningOomAdjusted;



            // Move to considering next runnable queue

            queue = nextQueue;

        }
@@ -464,9 +467,13 @@ class BroadcastQueueModernImpl extends BroadcastQueue { 
            // now; dispatch its next broadcast and clear the slot

            mRunningColdStart = null;



            // Now that we're running warm, we can finally request that OOM

            // adjust we've been waiting for

            notifyStartedRunning(queue);

            mService.updateOomAdjPendingTargetsLocked(OOM_ADJ_REASON_START_RECEIVER);



            queue.traceProcessEnd();

            queue.traceProcessRunningBegin();

            notifyStartedRunning(queue);

            scheduleReceiverWarmLocked(queue);



            // We might be willing to kick off another cold start
@@ -809,9 +816,9 @@ class BroadcastQueueModernImpl extends BroadcastQueue { 
     * ordered broadcast; assumes the sender is still a warm process.

     */

    private void scheduleResultTo(@NonNull BroadcastRecord r) {

        if ((r.resultToApp == null) || (r.resultTo == null)) return;

        if (r.resultTo == null) return;

        final ProcessRecord app = r.resultToApp;

        final IApplicationThread thread = app.getOnewayThread();

        final IApplicationThread thread = (app != null) ? app.getOnewayThread() : null;

        if (thread != null) {

            mService.mOomAdjuster.mCachedAppOptimizer.unfreezeTemporarily(

                    app, OOM_ADJ_REASON_FINISH_RECEIVER);

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

+5 −0
Original line number Diff line number Diff line
@@ -490,6 +490,11 @@ public final class PendingIntentRecord extends IIntentSender.Stub { 


            final IApplicationThread finishedReceiverThread = caller;

            boolean sendFinish = finishedReceiver != null;

            if ((finishedReceiver != null) && (finishedReceiverThread == null)) {

                Slog.w(TAG, "Sending of " + intent + " from " + Binder.getCallingUid()

                        + " requested resultTo without an IApplicationThread!", new Throwable());

            }



            int userId = key.userId;

            if (userId == UserHandle.USER_CURRENT) {

                userId = controller.mUserController.getCurrentOrTargetUserId();

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

+1 −1
Original line number Diff line number Diff line
@@ -1316,7 +1316,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                mAppSwitchesState = APP_SWITCH_ALLOW;

            }

        }

        return pir.sendInner(0, fillInIntent, resolvedType, allowlistToken, null, null,

        return pir.sendInner(caller, 0, fillInIntent, resolvedType, allowlistToken, null, null,

                resultTo, resultWho, requestCode, flagsMask, flagsValues, bOptions);

    }