Merge "CameraProxy: Clear calling identity before scheduling" into pi-dev (fdad4c51) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/camera/CameraServiceProxy.java

+16 −1

Original line number	Diff line number	Diff line
		@@ -165,12 +165,22 @@ public class CameraServiceProxy extends SystemService
		private final ICameraServiceProxy.Stub mCameraServiceProxy = new ICameraServiceProxy.Stub() {
		@Override
		public void pingForUserUpdate() {
		if (Binder.getCallingUid() != Process.CAMERASERVER_UID) {
		Slog.e(TAG, "Calling UID: " + Binder.getCallingUid() + " doesn't match expected " +
		" camera service UID!");
		return;
		}
		notifySwitchWithRetries(30);
		}

		@Override
		public void notifyCameraState(String cameraId, int newCameraState, int facing,
		String clientName, int apiLevel) {
		if (Binder.getCallingUid() != Process.CAMERASERVER_UID) {
		Slog.e(TAG, "Calling UID: " + Binder.getCallingUid() + " doesn't match expected " +
		" camera service UID!");
		return;
		}
		String state = cameraStateToString(newCameraState);
		String facingStr = cameraFacingToString(facing);
		if (DEBUG) Slog.v(TAG, "Camera " + cameraId + " facing " + facingStr + " state now " +
		@@ -301,7 +311,12 @@ public class CameraServiceProxy extends SystemService
		}
		mCameraUsageHistory.clear();
		}
		final long ident = Binder.clearCallingIdentity();
		try {
		CameraStatsJobService.schedule(mContext);
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}

		private void switchUserLocked(int userHandle) {