commit 2d9363f343c71a1f9f330922477ab0d889ecb9ee
author Luca Weiss <luca.weiss@fairphone.com> Wed Jun 15 15:40:57 2022 +0200
committer Luca Weiss <luca.weiss@fairphone.com> Tue Aug 02 12:24:18 2022 +0200
tree 8032cfd28395767a8b92e59e6a98af016245d077
parent 6d7208a3aac57fe090b549d69a1102ab37e64885

CaptureModule: improve instant capture trigger

Add a check with isVoiceInteractionRoot() to check that we've actually
been launched via voice interaction and not a spoofed intent. Also move
the CAMERA_OPEN_ONLY check up as there's no point in having the check
inside, it just triggers the "Trigger instant capture!" log message
erroneously.

Issue: FP2A10-205
Test: run gts-dev -m GtsAssistantHostTestCases
Change-Id: I2d8d757a33fbbb6e529b530a1ff0661853839b53

src/com/android/camera/CaptureModule.java

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 7213e34..fdb7a12 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -481,13 +481,12 @@
 
         // Check if we should take a snapshot without user interaction
         if (intentAction != null && intentAction.equals(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA) &&
-                intentCategories != null && intentCategories.contains(Intent.CATEGORY_VOICE)) {
+                intentCategories != null && intentCategories.contains(Intent.CATEGORY_VOICE) &&
+                activity.isVoiceInteractionRoot() &&
+                !intent.getBooleanExtra("com.google.assistant.extra.CAMERA_OPEN_ONLY", false)) {
             Log.i(TAG, "Trigger instant capture!");
 
-            if (!intent.getBooleanExtra("com.google.assistant.extra.CAMERA_OPEN_ONLY", false)) {
-                mInstantCaptureSnapShot = true;
-            }
-
+            mInstantCaptureSnapShot = true;
             mInstantCaptureDelay = intent.getIntExtra("android.intent.extra.TIMER_DURATION_SECONDS", 0);
         }