Merge "Fix the binder calling identity in setVrMode" into pi-dev am: 88757bbb8b (dad15d5c) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+12 −6

Original line number	Diff line number	Diff line
		@@ -14288,6 +14288,9 @@ public class ActivityManagerService extends IActivityManager.Stub
		return err;
		}

		// Clear the binder calling uid since this path may call moveToTask().
		final long callingId = Binder.clearCallingIdentity();
		try {
		synchronized(this) {
		r.requestedVrComponent = (enabled) ? packageName : null;

		@@ -14297,6 +14300,9 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		return 0;
		}
		} finally {
		Binder.restoreCallingIdentity(callingId);
		}
		}

		@Override