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

Commit 0074c31d authored by Jing Ji's avatar Jing Ji Committed by Android (Google) Code Review
Browse files

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

parents d1fdc4c4 af3415e8

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

    }