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

Commit e78c8ba8 authored by Wu-cheng Li's avatar Wu-cheng Li Committed by Android (Google) Code Review
Browse files

Merge "Use SINGLE_TOP and CLEAR_TOP when starting camera from lock scren."

parents 9a4a1a54 75e1ce63

policy/src/com/android/internal/policy/impl/LockScreen.java

+2 −1
Original line number Diff line number Diff line
@@ -231,7 +231,8 @@ class LockScreen extends LinearLayout implements KeyguardScreen { 
                if (!mCameraDisabled) {

                    // Start the Camera

                    Intent intent = new Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA);

                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK

                            | Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);

                    try {

                        ActivityManagerNative.getDefault().dismissKeyguardOnNextActivity();

                    } catch (RemoteException e) {