diff options
| author | Xin Li <delphij@google.com> | 2024-03-06 09:30:02 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-03-06 09:30:02 -0800 |
| commit | a14acf4bafdc97b2a964eb6c9bdaf8e62bc6050d (patch) | |
| tree | 3a452ef90afc8042d7d24d6bb1ecb4eedd2e64d6 | |
| parent | dd7c39aa3549f84a8f3aaa58d2314da106e869a5 (diff) | |
| parent | 3d289175cba82f9b52fae0b533b147a3535c8964 (diff) | |
| download | Camera2-a14acf4bafdc97b2a964eb6c9bdaf8e62bc6050d.tar.gz | |
Merge Android 14 QPR2 to AOSP main
Bug: 319669529
Merged-In: I57f86c8195ada9fb0aa37d0da0a95e3610f2f6db
Change-Id: Ic430e3dde495f979097cbaa625616b069ec9c736
| -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 { |