Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f786af32 authored by Austin Borger's avatar Austin Borger Committed by Automerger Merge Worker
Browse files

Merge "CameraServiceProxy: Create utility method for detecting if the camera... 

Merge "CameraServiceProxy: Create utility method for detecting if the camera is disabled by device policy." into tm-dev am: e48afc40 am: 74f016c4

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



Change-Id: Id0f116a786ea4dabbc0de3f5813f0c691b6df703
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d9a36ee6 74f016c4

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

+11 −0
Original line number Diff line number Diff line
@@ -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;