Merge "Camera: Clear identity before access device policy manager" into udc-qpr-dev (f29c879c) · Commits · e / os / android_frameworks_base

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

+17 −7

Original line number	Diff line number	Diff line
		@@ -613,6 +613,13 @@ public class CameraServiceProxy extends SystemService

		@Override
		public boolean isCameraDisabled(int userId) {
		if (Binder.getCallingUid() != Process.CAMERASERVER_UID) {
		Slog.e(TAG, "Calling UID: " + Binder.getCallingUid()
		+ " doesn't match expected camera service UID!");
		return false;
		}
		final long ident = Binder.clearCallingIdentity();
		try {
		DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
		if (dpm == null) {
		Slog.e(TAG, "Failed to get the device policy manager service");
		@@ -624,6 +631,9 @@ public class CameraServiceProxy extends SystemService
		e.printStackTrace();
		return false;
		}
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}
		};