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

Commit e0ef9d6c authored by Tony Mak's avatar Tony Mak Committed by Dan Pasanen
Browse files

Enforce policy for camera gesture in keyguard 

Test:
1. Set lock screen, set keyguard policy. Lock the device.
   Observe that double tap is not showing camera

2. Set lock screen, unset the keyguard policy. Lock the device.
   Observe that double tap is showing camera

3. Unset lock screen (swipe), set the keyguard policy. Lock the device.
   Observe that double tap is showing camera.

4. Unset lock screen (swipe), unset the keyguard policy. Lock the device.
   Observe that double tap is showing camera.

Bug: 63787722
Merged-In: I104688eaad719528376e2851f837d5956a6a1169

Change-Id: I42e6d9015682998176fe41971356bde22e1b37b2
(cherry picked from commit 65f02e8b)
parent 8d0e8330

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+19 −0
Original line number Diff line number Diff line
@@ -2710,4 +2710,23 @@ public abstract class BaseStatusBar extends SystemUI implements 
            mAssistManager.startAssist(args);

        }

    }



    public boolean isCameraAllowedByAdmin() {

       if (mDevicePolicyManager.getCameraDisabled(null, mCurrentUserId)) {

           return false;

       } else if (isKeyguardShowing() && isKeyguardSecure()) {

           // Check if the admin has disabled the camera specifically for the keyguard

           return (mDevicePolicyManager.getKeyguardDisabledFeatures(null, mCurrentUserId)

                   & DevicePolicyManager.KEYGUARD_DISABLE_SECURE_CAMERA) == 0;

       }

       return true;

    }



    public boolean isKeyguardShowing() {

        if (mStatusBarKeyguardViewManager == null) {

            Slog.i(TAG, "isKeyguardShowing() called before startKeyguard(), returning true");

            return true;

        }

        return mStatusBarKeyguardViewManager.isShowing();

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java

+3 −19
Original line number Diff line number Diff line
@@ -380,7 +380,9 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
                visible = !mShortcutHelper.isTargetEmpty(Shortcuts.RIGHT_SHORTCUT);

            } else {

                ResolveInfo resolved = resolveCameraIntent();

                visible = !isCameraDisabledByDpm() && resolved != null

                boolean isCameraDisabled =

                        (mPhoneStatusBar != null) && !mPhoneStatusBar.isCameraAllowedByAdmin();

                visible = !isCameraDisabled && resolved != null

                        && getResources().getBoolean(R.bool.config_keyguardShowCameraAffordance);

            }

        }
@@ -422,24 +424,6 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
                && pm.resolveActivity(PHONE_INTENT, 0) != null;

    }



    private boolean isCameraDisabledByDpm() {

        final DevicePolicyManager dpm =

                (DevicePolicyManager) getContext().getSystemService(Context.DEVICE_POLICY_SERVICE);

        if (dpm != null && mPhoneStatusBar != null) {

            try {

                final int userId = ActivityManagerNative.getDefault().getCurrentUser().id;

                final int disabledFlags = dpm.getKeyguardDisabledFeatures(null, userId);

                final  boolean disabledBecauseKeyguardSecure =

                        (disabledFlags & DevicePolicyManager.KEYGUARD_DISABLE_SECURE_CAMERA) != 0

                                && mPhoneStatusBar.isKeyguardSecure();

                return dpm.getCameraDisabled(null) || disabledBecauseKeyguardSecure;

            } catch (RemoteException e) {

                Log.e(TAG, "Can't get userId", e);

            }

        }

        return false;

    }



    private void watchForCameraPolicyChanges() {

        final IntentFilter filter = new IntentFilter();

        filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED);

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+5 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.graphics.Paint; 
import android.graphics.Rect;

import android.os.PowerManager;

import android.util.AttributeSet;

import android.util.EventLog;

import android.util.MathUtils;

import android.view.GestureDetector;

import android.view.MotionEvent;
@@ -2415,6 +2416,10 @@ public class NotificationPanelView extends PanelView implements 
     * @param keyguardIsShowing whether keyguard is being shown

     */

    public boolean canCameraGestureBeLaunched(boolean keyguardIsShowing) {

        if (!mStatusBar.isCameraAllowedByAdmin()) {

            EventLog.writeEvent(0x534e4554, "63787722", -1, "");

            return false;

        }

        ResolveInfo resolveInfo = mKeyguardBottomArea.resolveCameraIntent();

        String packageToLaunch = (resolveInfo == null || resolveInfo.activityInfo == null)

                ? null : resolveInfo.activityInfo.packageName;