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

Commit 364a165c authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Automerger Merge Worker
Browse files

Merge "Attaches source for camera launch when unlocked." into tm-qpr-dev am:... 

Merge "Attaches source for camera launch when unlocked." into tm-qpr-dev am: 4b452106 am: 924cd25b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20712456



Change-Id: I16f2c10d61eef0f1ca5a02f43a3da1ddd3e2bcdd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 94e8d0ee 924cd25b

packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt

+1 −7
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.os.RemoteException 
import android.os.UserHandle

import android.util.Log

import android.view.WindowManager

import androidx.annotation.VisibleForTesting

import com.android.keyguard.KeyguardUpdateMonitor

import com.android.systemui.ActivityIntentHelper

import com.android.systemui.dagger.qualifiers.Main
@@ -83,7 +82,7 @@ class CameraGestureHelper @Inject constructor( 
     */

    fun launchCamera(source: Int) {

        val intent: Intent = getStartCameraIntent()

        intent.putExtra(EXTRA_CAMERA_LAUNCH_SOURCE, source)

        intent.putExtra(CameraIntents.EXTRA_LAUNCH_SOURCE, source)

        val wouldLaunchResolverActivity = activityIntentHelper.wouldLaunchResolverActivity(

            intent, KeyguardUpdateMonitor.getCurrentUser()

        )
@@ -149,9 +148,4 @@ class CameraGestureHelper @Inject constructor( 
            cameraIntents.getInsecureCameraIntent()

        }

    }



    companion object {

        @VisibleForTesting

        const val EXTRA_CAMERA_LAUNCH_SOURCE = "com.android.systemui.camera_launch_source"

    }

}

packages/SystemUI/src/com/android/systemui/camera/CameraIntents.kt

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ class CameraIntents { 
                MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE

        val DEFAULT_INSECURE_CAMERA_INTENT_ACTION =

                MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA

        const val EXTRA_LAUNCH_SOURCE = "com.android.systemui.camera_launch_source"



        @JvmStatic

        fun getOverrideCameraPackage(context: Context): String? {

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

+1 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba 


        if (!mKeyguardStateController.isShowing()) {

            final Intent cameraIntent = CameraIntents.getInsecureCameraIntent(mContext);

            cameraIntent.putExtra(CameraIntents.EXTRA_LAUNCH_SOURCE, source);

            mCentralSurfaces.startActivityDismissingKeyguard(cameraIntent,

                    false /* onlyProvisioned */, true /* dismissShade */,

                    true /* disallowEnterPictureInPictureWhileLaunching */, null /* callback */, 0,

packages/SystemUI/tests/src/com/android/systemui/camera/CameraGestureHelperTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ class CameraGestureHelperTest : SysuiTestCase() { 
        val intent = intentCaptor.value



        assertThat(CameraIntents.isSecureCameraIntent(intent)).isEqualTo(isSecure)

        assertThat(intent.getIntExtra(CameraGestureHelper.EXTRA_CAMERA_LAUNCH_SOURCE, -1))

        assertThat(intent.getIntExtra(CameraIntents.EXTRA_LAUNCH_SOURCE, -1))

            .isEqualTo(source)

    }