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

Commit fdd821f5 authored by Abhisek Devkota's avatar Abhisek Devkota Committed by Gerrit Code Review
Browse files

Merge "Keyguard: Make sure disabling Camera widget" into cm-11.0

parents 387ab586 89a99927

packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java

+3 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.content.pm.UserInfo; 
import android.content.res.Resources;

import android.graphics.Canvas;

import android.graphics.Rect;

import android.hardware.Camera;

import android.media.RemoteControlClient;

import android.os.Bundle;

import android.os.Looper;
@@ -1297,7 +1298,8 @@ public class KeyguardHostView extends KeyguardViewBase { 
        // cameras we can't trust.  TODO: plumb safe mode into camera creation code and only

        // inflate system-provided camera?

        if (!mSafeModeEnabled && !cameraDisabledByDpm() && mUserSetupCompleted

                && mContext.getResources().getBoolean(R.bool.kg_enable_camera_default_widget)) {

                && mContext.getResources().getBoolean(R.bool.kg_enable_camera_default_widget)

                && Camera.getNumberOfCameras() > 0) {

            View cameraWidget =

                    CameraWidgetFrame.create(mContext, mCameraWidgetCallbacks, mActivityLauncher);

            if (cameraWidget != null) {