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

Commit 424a366e authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Fix IndexOutOfBoundsException in process start timeout" into sc-dev am:... 

Merge "Fix IndexOutOfBoundsException in process start timeout" into sc-dev am: 0074c31d am: 993f085d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13448383

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f608de97f758b79cf32accaeb4b737ef95aa0b8
parents dacb17f3 993f085d

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

+1 −0
Original line number Diff line number Diff line
@@ -4217,6 +4217,7 @@ public final class ActiveServices { 
                Slog.w(TAG, "Forcing bringing down service: " + sr);

                sr.isolatedProc = null;

                mPendingServices.remove(i);

                size = mPendingServices.size();

                i--;

                needOomAdj = true;

                bringDownServiceLocked(sr, true);

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

+1 −1
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ class ProcessRecord implements WindowProcessListener { 
    }



    public void makeActive(IApplicationThread _thread, ProcessStatsService tracker) {

        mProfile.onProcessActive(thread, tracker);

        mProfile.onProcessActive(_thread, tracker);

        thread = _thread;

        mWindowProcessController.setThread(thread);

    }