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

Commit 1b196fba 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: 6d10a577

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



Change-Id: Ia0e48837865ef699ea3766a97b0001571d5a4c99
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents db193bb8 6d10a577

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

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