diff options
| author | Xin Li <delphij@google.com> | 2024-03-07 06:41:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-07 06:41:10 +0000 |
| commit | 669cddec82531fab05c06924dd67912db043d386 (patch) | |
| tree | 3a452ef90afc8042d7d24d6bb1ecb4eedd2e64d6 | |
| parent | dd7c39aa3549f84a8f3aaa58d2314da106e869a5 (diff) | |
| parent | a14acf4bafdc97b2a964eb6c9bdaf8e62bc6050d (diff) | |
| download | Camera2-669cddec82531fab05c06924dd67912db043d386.tar.gz | |
Merge "Merge Android 14 QPR2 to AOSP main" into main
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index e1e80d2d9..3093b2584 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1705,8 +1705,12 @@ public class CameraActivity extends QuickActivity 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 { |