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

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

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