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

Commit e48afc40 authored by Austin Borger's avatar Austin Borger Committed by Android (Google) Code Review
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
parents 9750b0ca 8e63c385
Loading
Loading
Loading
Loading
+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;