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

Merge "CameraServiceProxy: Create utility method for detecting if the camera is disabled by device policy." into tm-dev am: e48afc4089 am: 7b10b3ae7b

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

Change-Id: Iccb7ecd711e0634195fd086f7be122405f86de6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Austin Borger
2022-05-03 19:20:22 +00:00
committed by Automerger Merge Worker
parent 63c929a5b3 7b10b3ae7b
commit d792f436b8
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,7 @@ import android.annotation.Nullable;
import android.annotation.TestApi; import android.annotation.TestApi;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.ActivityTaskManager; import android.app.ActivityTaskManager;
import android.app.admin.DevicePolicyManager;
import android.app.compat.CompatChanges; import android.app.compat.CompatChanges;
import android.compat.annotation.ChangeId; import android.compat.annotation.ChangeId;
import android.compat.annotation.Disabled; import android.compat.annotation.Disabled;
@@ -576,6 +577,16 @@ public class CameraServiceProxy extends SystemService
updateActivityCount(cameraState); updateActivityCount(cameraState);
} }
@Override
public boolean isCameraDisabled() {
DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
if (dpm == null) {
Slog.e(TAG, "Failed to get the device policy manager service");
return false;
}
return dpm.getCameraDisabled(null);
}
}; };
private final FoldStateListener mFoldStateListener; private final FoldStateListener mFoldStateListener;