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

Merge "Improve thread safety of ManagedServices.java" into tm-qpr-dev

Browse Source
This commit is contained in:
Matías Hernández
2023-01-30 19:16:43 +00:00
committed by Android (Google) Code Review
parent b21f162dfe a30b2fc5b3
commit 3944b83123
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/notification/ManagedServices.java
View File

@@ -132,6 +132,7 @@ abstract public class ManagedServices {
// contains connections to all connected services, including app services // contains connections to all connected services, including app services
// and system services // and system services
@GuardedBy("mMutex")
private final ArrayList<ManagedServiceInfo> mServices = new ArrayList<>(); private final ArrayList<ManagedServiceInfo> mServices = new ArrayList<>();
/** /**
* The services that have been bound by us. If the service is also connected, it will also * The services that have been bound by us. If the service is also connected, it will also
@@ -157,7 +158,8 @@ abstract public class ManagedServices {
// List of approved packages or components (by user, then by primary/secondary) that are // List of approved packages or components (by user, then by primary/secondary) that are
// allowed to be bound as managed services. A package or component appearing in this list does // allowed to be bound as managed services. A package or component appearing in this list does
// not mean that we are currently bound to said package/component. // not mean that we are currently bound to said package/component.
protected ArrayMap<Integer, ArrayMap<Boolean, ArraySet<String>>> mApproved = new ArrayMap<>(); protected final ArrayMap<Integer, ArrayMap<Boolean, ArraySet<String>>> mApproved =
new ArrayMap<>();
// List of packages or components (by user) that are configured to be enabled/disabled // List of packages or components (by user) that are configured to be enabled/disabled
// explicitly by the user // explicitly by the user
@@ -316,6 +318,7 @@ abstract public class ManagedServices {
return changes; return changes;
} }
@GuardedBy("mApproved")
private boolean clearUserSetFlagLocked(ComponentName component, int userId) { private boolean clearUserSetFlagLocked(ComponentName component, int userId) {
String approvedValue = getApprovedValue(component.flattenToString()); String approvedValue = getApprovedValue(component.flattenToString());
ArraySet<String> userSet = mUserSetServices.get(userId); ArraySet<String> userSet = mUserSetServices.get(userId);
@@ -376,8 +379,8 @@ abstract public class ManagedServices {
pw.println(" " + cmpt); pw.println(" " + cmpt);
} }
pw.println(" Live " + getCaption() + "s (" + mServices.size() + "):");
synchronized (mMutex) { synchronized (mMutex) {
pw.println(" Live " + getCaption() + "s (" + mServices.size() + "):");
for (ManagedServiceInfo info : mServices) { for (ManagedServiceInfo info : mServices) {
if (filter != null && !filter.matches(info.component)) continue; if (filter != null && !filter.matches(info.component)) continue;
pw.println(" " + info.component pw.println(" " + info.component
@@ -1011,10 +1014,12 @@ abstract public class ManagedServices {
return null; return null;
} }
final IBinder token = service.asBinder(); final IBinder token = service.asBinder();
final int N = mServices.size(); synchronized (mMutex) {
for (int i = 0; i < N; i++) { final int nServices = mServices.size();
final ManagedServiceInfo info = mServices.get(i); for (int i = 0; i < nServices; i++) {
if (info.service.asBinder() == token) return info; final ManagedServiceInfo info = mServices.get(i);
if (info.service.asBinder() == token) return info;
}
} }
return null; return null;
} }
@@ -1488,10 +1493,12 @@ abstract public class ManagedServices {
} }
} }
@GuardedBy("mMutex")
private void registerServiceLocked(final ComponentName name, final int userid) { private void registerServiceLocked(final ComponentName name, final int userid) {
registerServiceLocked(name, userid, false /* isSystem */); registerServiceLocked(name, userid, false /* isSystem */);
} }
@GuardedBy("mMutex")
private void registerServiceLocked(final ComponentName name, final int userid, private void registerServiceLocked(final ComponentName name, final int userid,
final boolean isSystem) { final boolean isSystem) {
if (DEBUG) Slog.v(TAG, "registerService: " + name + " u=" + userid); if (DEBUG) Slog.v(TAG, "registerService: " + name + " u=" + userid);
@@ -1622,6 +1629,7 @@ abstract public class ManagedServices {
} }
} }
@GuardedBy("mMutex")
private void unregisterServiceLocked(ComponentName name, int userid) { private void unregisterServiceLocked(ComponentName name, int userid) {
final int N = mServices.size(); final int N = mServices.size();
for (int i = N - 1; i >= 0; i--) { for (int i = N - 1; i >= 0; i--) {
@@ -1656,6 +1664,7 @@ abstract public class ManagedServices {
return serviceInfo; return serviceInfo;
} }
@GuardedBy("mMutex")
private ManagedServiceInfo removeServiceLocked(int i) { private ManagedServiceInfo removeServiceLocked(int i) {
final ManagedServiceInfo info = mServices.remove(i); final ManagedServiceInfo info = mServices.remove(i);
onServiceRemovedLocked(info); onServiceRemovedLocked(info);