From af3415e803c19518419f59421b24be8a443ba865 Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Sun, 31 Jan 2021 20:54:56 -0800
Subject: [PATCH] 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
---
 services/core/java/com/android/server/am/ActiveServices.java | 1 +
 services/core/java/com/android/server/am/ProcessRecord.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 02613cfe07718..0c8172d204c45 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -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);
diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java
index f7e87ef94939d..a1adeaac52ca0 100644
--- a/services/core/java/com/android/server/am/ProcessRecord.java
+++ b/services/core/java/com/android/server/am/ProcessRecord.java
@@ -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);
     }