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

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

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

parents 820e3ce8 9ad38c4e
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -4513,8 +4513,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);