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

Merge "Fix race condition when collecting op callback."

Browse Source
This commit is contained in:
Jeff Sharkey
2015-12-03 16:58:34 +00:00
committed by Gerrit Code Review
parent 4ef9d41066 40b300fd80
commit 98844a97d2
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/AppOpsService.java
View File

@@ -513,6 +513,7 @@ public class AppOpsService extends IAppOpsService.Stub {
String[] uidPackageNames = getPackagesForUid(uid); String[] uidPackageNames = getPackagesForUid(uid);
ArrayMap<Callback, ArraySet<String>> callbackSpecs = null; ArrayMap<Callback, ArraySet<String>> callbackSpecs = null;
synchronized (this) {
ArrayList<Callback> callbacks = mOpModeWatchers.get(code); ArrayList<Callback> callbacks = mOpModeWatchers.get(code);
if (callbacks != null) { if (callbacks != null) {
final int callbackCount = callbacks.size(); final int callbackCount = callbacks.size();
@@ -543,6 +544,7 @@ public class AppOpsService extends IAppOpsService.Stub {
} }
} }
} }
}
if (callbackSpecs == null) { if (callbackSpecs == null) {
return; return;