Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ib34620a9739684ec02138277928557f96643fbdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jing Ji
2022-05-02 20:19:35 +00:00
committed by Automerger Merge Worker
parent 739f078940 4a06572836
commit 31aa80b230
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/am/ActivityManagerService.java
View File

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