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

Commit 31aa80b2 authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Info the am instrumentation if test process attach failed." into tm-dev... 

Merge "Info the am instrumentation if test process attach failed." into tm-dev am: 91fa7a8d am: 4a065728

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



Change-Id: Ib34620a9739684ec02138277928557f96643fbdc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 739f0789 4a065728

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

+8 −1
Original line number Diff line number Diff line
@@ -4511,8 +4511,15 @@ public class ActivityManagerService extends IActivityManager.Stub 
                // We're going to cleanup the successor process record, which wasn't started at all.

                app = successor;

            } else {

                Slog.w(TAG, "Process " + app + " failed to attach");

                final String msg = "Process " + app + " failed to attach";

                Slog.w(TAG, msg);

                EventLogTags.writeAmProcessStartTimeout(app.userId, pid, app.uid, app.processName);

                if (app.getActiveInstrumentation() != null) {

                    final Bundle info = new Bundle();

                    info.putString("shortMsg", "failed to attach");

                    info.putString("longMsg", msg);

                    finishInstrumentationLocked(app, Activity.RESULT_CANCELED, info);

                }

            }

            synchronized (mProcLock) {

                mProcessList.removeProcessNameLocked(app.processName, app.uid);