From 8e63c3852770dd9e272b397448906ac4221cac3d Mon Sep 17 00:00:00 2001 From: Austin Borger Date: Tue, 26 Apr 2022 15:53:16 -0700 Subject: [PATCH] CameraServiceProxy: Create utility method for detecting if the camera is disabled by device policy. Bug: 230026863, 203063139 Test: Verified camera app closes when both settings are disabled. Change-Id: I7006ef93ed213eb05d5abd060b14ce02dcd2976c --- .../com/android/server/camera/CameraServiceProxy.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/services/core/java/com/android/server/camera/CameraServiceProxy.java b/services/core/java/com/android/server/camera/CameraServiceProxy.java index be112537274ae..bdd5b3d52e736 100644 --- a/services/core/java/com/android/server/camera/CameraServiceProxy.java +++ b/services/core/java/com/android/server/camera/CameraServiceProxy.java @@ -24,6 +24,7 @@ import android.annotation.Nullable; import android.annotation.TestApi; import android.app.ActivityManager; import android.app.ActivityTaskManager; +import android.app.admin.DevicePolicyManager; import android.app.compat.CompatChanges; import android.compat.annotation.ChangeId; import android.compat.annotation.Disabled; @@ -576,6 +577,16 @@ public class CameraServiceProxy extends SystemService 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;