diff options
| author | Shuzhen Wang <shuzhenwang@google.com> | 2023-10-31 20:39:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-31 20:39:12 +0000 |
| commit | a73f9d3e0d448a3d28f0ccc3a757577c39f7aca5 (patch) | |
| tree | 34a8e6f89ba2dafb48d20631efe0c5f150af90ba | |
| parent | 449f21a3666859006d7a10d0f443438d19be9200 (diff) | |
| parent | 3c097bb0e516b1d071f00ac99a8f29f4a72579ff (diff) | |
| download | Camera2-a73f9d3e0d448a3d28f0ccc3a757577c39f7aca5.tar.gz | |
Camera2: Do not pass location info for startActivity case am: 3c097bb0e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/25135945
Change-Id: Id70d6e5ce2e3217f03ca3faf3d8f71887d3a5687
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 18d87bf24..7881853c1 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1738,8 +1738,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 { |