Merge "Dispatch pending events outside a lock" into main (2b7d92aa) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/DisplayManagerService.java

+20 −17

Original line number	Diff line number	Diff line
		@@ -4382,7 +4382,7 @@ public final class DisplayManagerService extends SystemService {
		// would be unusual to do so. The method returns true on success.
		// This is only used if {@link deferDisplayEventsWhenFrozen()} is true.
		public boolean dispatchPending() {
		try {
		Event[] pending;
		synchronized (mCallback) {
		if (mPendingEvents == null \|\| mPendingEvents.isEmpty() \|\| !mAlive) {
		return true;
		@@ -4390,8 +4390,13 @@ public final class DisplayManagerService extends SystemService {
		if (!isReadyLocked()) {
		return false;
		}
		for (int i = 0; i < mPendingEvents.size(); i++) {
		Event displayEvent = mPendingEvents.get(i);
		pending = new Event[mPendingEvents.size()];
		pending = mPendingEvents.toArray(pending);
		mPendingEvents.clear();
		}
		try {
		for (int i = 0; i < pending.length; i++) {
		Event displayEvent = pending[i];
		if (DEBUG) {
		Slog.d(TAG, "Send pending display event #" + i + " "
		+ displayEvent.displayId + "/"
		@@ -4399,9 +4404,7 @@ public final class DisplayManagerService extends SystemService {
		}
		transmitDisplayEvent(displayEvent.displayId, displayEvent.event);
		}
		mPendingEvents.clear();
		return true;
		}
		} catch (RemoteException ex) {
		Slog.w(TAG, "Failed to notify process "
		+ mPid + " that display topology changed, assuming it died.", ex);