Merge "Catch the missing return path when clearing Binder identity" into main (34fa43e8) · Commits · e / os / android_frameworks_base

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -188,13 +188,13 @@ class AppTaskImpl extends IAppTask.Stub {
		final int origCallingPid = Binder.getCallingPid();
		final int origCallingUid = Binder.getCallingUid();
		final long origId = Binder.clearCallingIdentity();
		try {
		if (mService.checkPermission(REPOSITION_SELF_WINDOWS, origCallingPid, origCallingUid)
		!= PERMISSION_GRANTED) {
		reportTaskMoveRequestResult(
		RESULT_FAILED_NO_PERMISSIONS, INVALID_DISPLAY, null /* bounds */, callback);
		return;
		}
		try {
		synchronized (mService.mGlobalLock) {
		final Task task = mService.mRootWindowContainer.anyTaskForId(mTaskId);
		if (task == null) {