diff options
| author | 2020-10-12 11:48:26 +0800 | |
|---|---|---|
| committer | 2020-10-12 11:48:26 +0800 | |
| commit | 8cef293dda10ac9444b3ed959019a001f92f59d4 (patch) | |
| tree | 633a86dd52b7df3bb21b2c402b7bc6a4a81dc4d3 | |
| parent | 29f12866c2d574d520ce8e718b8eac2041c29d4d (diff) | |
Attempt to fix presubmit failure
System crashed while running presubmit. The #getDisplayIdsLocked()
was not guarded by synchronization since commit 05e1c1a.
Bug: 170451499
Test: presubmit
Change-Id: I4f2dfd2637632f722d6223469d478940db152e45
| -rw-r--r-- | services/core/java/com/android/server/display/DisplayManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index af62aeba4cfb..ca94efc3e5a0 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -1768,7 +1768,9 @@ public final class DisplayManagerService extends SystemService { final int callingUid = Binder.getCallingUid(); final long token = Binder.clearCallingIdentity(); try { - return mLogicalDisplayMapper.getDisplayIdsLocked(callingUid); + synchronized (mSyncRoot) { + return mLogicalDisplayMapper.getDisplayIdsLocked(callingUid); + } } finally { Binder.restoreCallingIdentity(token); } |