commit 76aa9ef151da51d8fddeaf9001f7589eee502ee5
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Apr 22 16:15:10 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 22 16:15:10 2024 +0000
tree d328c959d69b5e1d308b85d3cbf753d8f92b23af
parent 669cddec82531fab05c06924dd67912db043d386
parent 2e6807fc743585925cc9202c94336eb6bf1b06b9

Merge "Migrate Test Targets to New Android Ownership Model" into main

src/com/android/camera/CameraActivity.java

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index e1e80d2..3093b25 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1705,8 +1705,12 @@
     private boolean shouldUseNoOpLocation () {
         String callingPackage = getCallingPackage();
         if (callingPackage == null) {
-            // Activity not started through startActivityForResult.
-            return false;
+            if (isCaptureIntent()) {
+                // Activity not started through startActivityForResult.
+                return true;
+            } else {
+                callingPackage = mAppContext.getPackageName();
+            }
         }
         PackageInfo packageInfo = null;
         try {