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

Commit 9ad38c4e authored by Jing Ji's avatar Jing Ji
Browse files

Info the am instrumentation if test process attach failed. 

Bug: 230124334
Test: Manual - induce a crash in test process before attaching
Change-Id: I510bc5ab9f55b18d7deeb5f68352dab9da0bcc2b
parent a2a6d884

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

+8 −1
Original line number Diff line number Diff line
@@ -4534,8 +4534,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);