Merge "Clear Binder identity on calls into DreamService." into main (fada2c5d) · Commits · e / os / android_frameworks_base

core/java/android/service/dreams/DreamService.java

+40 −9

Original line number	Original line	Diff line number	Diff line
	@@ -1211,13 +1211,23 @@ public class DreamService extends Service implements Window.Callback {
	mOverlayCallback = new IDreamOverlayCallback.Stub() {		mOverlayCallback = new IDreamOverlayCallback.Stub() {
	@Override		@Override
	public void onExitRequested() {		public void onExitRequested() {
			final long token = Binder.clearCallingIdentity();
			try {
	// Simply finish dream when exit is requested.		// Simply finish dream when exit is requested.
	mHandler.post(() -> finishInternal());		mHandler.post(() -> finishInternal());
			} finally {
			Binder.restoreCallingIdentity(token);
			}
	}		}

	@Override		@Override
	public void onRedirectWake(boolean redirect) {		public void onRedirectWake(boolean redirect) {
			final long token = Binder.clearCallingIdentity();
			try {
	mRedirectWake = redirect;		mRedirectWake = redirect;
			} finally {
			Binder.restoreCallingIdentity(token);
			}
	}		}
	};		};

	@@ -1883,25 +1893,46 @@ public class DreamService extends Service implements Window.Callback {
	@Override		@Override
	public void attach(final IBinder dreamToken, final boolean canDoze,		public void attach(final IBinder dreamToken, final boolean canDoze,
	final boolean isPreviewMode, IRemoteCallback started) {		final boolean isPreviewMode, IRemoteCallback started) {
	post(dreamService -> dreamService.attach(dreamToken, canDoze, isPreviewMode, started));		final long token = Binder.clearCallingIdentity();
			try {
			post(dreamService -> dreamService.attach(dreamToken, canDoze, isPreviewMode,
			started));
			} finally {
			Binder.restoreCallingIdentity(token);
			}
	}		}

	@Override		@Override
	public void detach() {		public void detach() {
			final long token = Binder.clearCallingIdentity();
			try {
	post(DreamService::detach);		post(DreamService::detach);
			} finally {
			Binder.restoreCallingIdentity(token);
			}
	}		}

	@Override		@Override
	public void wakeUp() {		public void wakeUp() {
			final long token = Binder.clearCallingIdentity();
			try {
	post(dreamService -> dreamService.wakeUp(true /fromSystem/));		post(dreamService -> dreamService.wakeUp(true /fromSystem/));
			} finally {
			Binder.restoreCallingIdentity(token);
			}
	}		}

	@Override		@Override
	public void comeToFront() {		public void comeToFront() {
			final long token = Binder.clearCallingIdentity();
			try {
	if (!dreamHandlesBeingObscured()) {		if (!dreamHandlesBeingObscured()) {
	return;		return;
	}		}
	post(DreamService::comeToFront);		post(DreamService::comeToFront);
			} finally {
			Binder.restoreCallingIdentity(token);
			}
	}		}
	}		}