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

Commit af3415e8 authored by Jing Ji's avatar Jing Ji
Browse files

Fix IndexOutOfBoundsException in process start timeout 

Also fixed a test failure with AmProfileTests

Bug: 178967602
Bug: 178978839
Test: Build & boot Ok
Test: atest AmProfileTests
Change-Id: I69daf4dd8377b57c05a1835bd21d5b3e62ff7ef0
parent 551929ac

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

    }