Merge "Fix race condition in binding isolated services in shared process." into udc-dev

2023-05-11 21:02:50 +00:00
parent f141590772 a2728a3804
commit b529df739f
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -5244,6 +5244,7 @@ public final class ActiveServices {
                    final IApplicationThread thread = app.getThread();
                    final int pid = app.getPid();
                    final UidRecord uidRecord = app.getUidRecord();
+                    r.isolationHostProc = app;
                    if (thread != null) {
                        try {
                            if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {