Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Camera: Clear identity before access device policy manager" into main am: 6cc598239e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2652179

Change-Id: I3784e485d5b11068d167e76b1e96e168157b7b17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Austin Borger
2023-07-10 21:00:42 +00:00
committed by Automerger Merge Worker
parent 5f753cfcbf 6cc598239e
commit 63827abeb6
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/camera/CameraServiceProxy.java
View File

@@ -595,6 +595,13 @@ public class CameraServiceProxy extends SystemService
@Override @Override
public boolean isCameraDisabled(int userId) { 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); DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
if (dpm == null) { if (dpm == null) {
Slog.e(TAG, "Failed to get the device policy manager service"); Slog.e(TAG, "Failed to get the device policy manager service");
@@ -606,6 +613,9 @@ public class CameraServiceProxy extends SystemService
e.printStackTrace(); e.printStackTrace();
return false; return false;
} }
} finally {
Binder.restoreCallingIdentity(ident);
}
} }
}; };