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

Merge "Acquire proc lock prior to the call into AM service connection holder" into sc-dev

Browse Source
This commit is contained in:
Jing Ji
2021-04-09 01:08:51 +00:00
committed by Android (Google) Code Review
parent e7c7e61410 b53ff45a2f
commit db4ff9ef89
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15656,9 +15656,11 @@ public class ActivityManagerService extends IActivityManager.Stub
final ActivityServiceConnectionsHolder holder = final ActivityServiceConnectionsHolder holder =
(ActivityServiceConnectionsHolder) connectionHolder; (ActivityServiceConnectionsHolder) connectionHolder;
synchronized (ActivityManagerService.this) { synchronized (ActivityManagerService.this) {
holder.forEachConnection(cr -> mServices.removeConnectionLocked( synchronized (mProcLock) {
(ConnectionRecord) cr, null /* skipApp */, holder /* skipAct */, holder.forEachConnection(cr -> mServices.removeConnectionLocked(
false /* enqueueOomAdj */)); (ConnectionRecord) cr, null /* skipApp */, holder /* skipAct */,
false /* enqueueOomAdj */));
}
} }
} }