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

Merge "Fix concurrent modification crash in onAlarm"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-23 03:19:32 +00:00
committed by Android (Google) Code Review
parent d55e21edaa 37dfb42992
commit e9d8fa11b6
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/GraphicsStatsService.java
View File

@@ -137,16 +137,21 @@ public class GraphicsStatsService extends IGraphicsStats.Stub {
}
private void onAlarm() {
// We need to make a copy since some of the callbacks won't be proxy and thus
// can result in a re-entrant acquisition of mLock that would result in a modification
// of mActive during iteration.
ActiveBuffer[] activeCopy;
synchronized (mLock) {
mRotateIsScheduled = false;
scheduleRotateLocked();
for (ActiveBuffer active : mActive) {
try {
active.mCallback.onRotateGraphicsStatsBuffer();
} catch (RemoteException e) {
Log.w(TAG, String.format("Failed to notify '%s' (pid=%d) to rotate buffers",
active.mInfo.packageName, active.mPid), e);
}
activeCopy = mActive.toArray(new ActiveBuffer[0]);
}
for (ActiveBuffer active : activeCopy) {
try {
active.mCallback.onRotateGraphicsStatsBuffer();
} catch (RemoteException e) {
Log.w(TAG, String.format("Failed to notify '%s' (pid=%d) to rotate buffers",
active.mInfo.packageName, active.mPid), e);
}
}
// Give a few seconds for everyone to rotate before doing the cleanup