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

Commit 6d10a577 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 am: 91fa7a8d 

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



Change-Id: Ib279adfca7b1cb6b7d9c4ebb6c2ad3485821d347
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c83f6f8a 91fa7a8d

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

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