Merge "Removed unnecessary global lock for register/unregister capture observer method." into main (7a7e87ec) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/ActivityRecord.java

+8 −12

Original line number	Diff line number	Diff line
		@@ -6840,7 +6840,7 @@ final class ActivityRecord extends WindowToken {
		}
		}

		public void reportScreenCaptured() {
		void reportScreenCaptured() {
		if (mCaptureCallbacks != null) {
		final int n = mCaptureCallbacks.beginBroadcast();
		for (int i = 0; i < n; i++) {
		@@ -6854,22 +6854,18 @@ final class ActivityRecord extends WindowToken {
		}
		}

		public void registerCaptureObserver(IScreenCaptureObserver observer) {
		synchronized (mWmService.mGlobalLock) {
		void registerCaptureObserver(IScreenCaptureObserver observer) {
		if (mCaptureCallbacks == null) {
		mCaptureCallbacks = new RemoteCallbackList<IScreenCaptureObserver>();
		mCaptureCallbacks = new RemoteCallbackList<>();
		}
		mCaptureCallbacks.register(observer);
		}
		}

		public void unregisterCaptureObserver(IScreenCaptureObserver observer) {
		synchronized (mWmService.mGlobalLock) {
		void unregisterCaptureObserver(IScreenCaptureObserver observer) {
		if (mCaptureCallbacks != null) {
		mCaptureCallbacks.unregister(observer);
		}
		}
		}

		boolean isRegisteredForScreenCaptureCallback() {
		return mCaptureCallbacks != null && mCaptureCallbacks.getRegisteredCallbackCount() > 0;