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

Commit 50956980 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Save per-user camera policy in different system properties 

If a device admin for a user disables the device cameras,
only apply that policy to that user and not globally.

Corresponding change in CameraService looks into the
per-user system property.

This also fixes the bug that managed profile owner is
able to disable camera for the personal profile.

Bug: 19345698
Change-Id: Ibd5e438544a0409f26087ced247d50c706fcf843
parent 094ff96b

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+7 −5
Original line number Diff line number Diff line
@@ -1579,15 +1579,16 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
    void syncDeviceCapabilitiesLocked(DevicePolicyData policy) {

        // Ensure the status of the camera is synced down to the system. Interested native services

        // should monitor this value and act accordingly.

        boolean systemState = SystemProperties.getBoolean(SYSTEM_PROP_DISABLE_CAMERA, false);

        String cameraPropertyForUser = SYSTEM_PROP_DISABLE_CAMERA_PREFIX + policy.mUserHandle;

        boolean systemState = SystemProperties.getBoolean(cameraPropertyForUser, false);

        boolean cameraDisabled = getCameraDisabled(null, policy.mUserHandle);

        if (cameraDisabled != systemState) {

            long token = Binder.clearCallingIdentity();

            try {

                String value = cameraDisabled ? "1" : "0";

                if (DBG) Slog.v(LOG_TAG, "Change in camera state ["

                        + SYSTEM_PROP_DISABLE_CAMERA + "] = " + value);

                SystemProperties.set(SYSTEM_PROP_DISABLE_CAMERA, value);

                        + cameraPropertyForUser + "] = " + value);

                SystemProperties.set(cameraPropertyForUser, value);

            } finally {

                Binder.restoreCallingIdentity(token);

            }
@@ -3611,9 +3612,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 


    /**

     * The system property used to share the state of the camera. The native camera service

     * is expected to read this property and act accordingly.

     * is expected to read this property and act accordingly. The userId should be appended

     * to this key.

     */

    public static final String SYSTEM_PROP_DISABLE_CAMERA = "sys.secpolicy.camera.disabled";

    public static final String SYSTEM_PROP_DISABLE_CAMERA_PREFIX = "sys.secpolicy.camera.off_";



    /**

     * Disables all device cameras according to the specified admin.