From a50c2496b28dd452025545f678e815239635dcda Mon Sep 17 00:00:00 2001 From: Alexander Martinz Date: Wed, 6 May 2020 12:00:19 +0200 Subject: CaptureUI: handle secure capture when reviewing pictures Test: run cts --skip-preconditions -m CtsProviderUiTestCases -t android.providerui.cts.MediaStoreUiTest#testImageCaptureWithInadequeteLocationPermissions Change-Id: I492103ff68036f4c3474d4172a3ba31ab19efe1b Signed-off-by: Alexander Martinz --- src/com/android/camera/CaptureUI.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index 51138a2ec..58b0005ec 100755 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -483,10 +483,17 @@ public class CaptureUI implements PreviewGestures.SingleTapListener, mReviewDoneButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (intentMode == CaptureModule.INTENT_MODE_CAPTURE) { - mModule.onCaptureDone(); - } else if (intentMode == CaptureModule.INTENT_MODE_VIDEO) { - mModule.onRecordingDone(true); + switch (intentMode) { + case CaptureModule.INTENT_MODE_CAPTURE: + case CaptureModule.INTENT_MODE_CAPTURE_SECURE: + mModule.onCaptureDone(); + break; + case CaptureModule.INTENT_MODE_VIDEO: + mModule.onRecordingDone(true); + break; + default: + Log.w(TAG, "Not handling review of intent mode: " + intentMode); + break; } } }); -- cgit v1.2.3