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

Merge "Possibly fix deadlock." into nyc-dev

Browse Source 
am: a0424c729f

* commit 'a0424c729f32164fb17dc9d92978f84897d75c7b':
  Possibly fix deadlock.
This commit is contained in:
Julia Reynolds
2016-02-12 19:07:02 +00:00
committed by android-build-merger
parent ea5b8849bc a0424c729f
commit bae580272a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/notification/ConditionProviders.java
View File

@@ -234,9 +234,13 @@ public class ConditionProviders extends ManagedServices {
final ConditionRecord r = getRecordLocked(c.id, info.component, true /*create*/);
r.info = info;
r.condition = c;
if (mCallback != null) {
mCallback.onConditionChanged(c.id, c);
}
}
}
final int N = conditions.length;
for (int i = 0; i < N; i++) {
final Condition c = conditions[i];
if (mCallback != null) {
mCallback.onConditionChanged(c.id, c);
}
}
}