diff options
| author | Shuzhen Wang <shuzhenwang@google.com> | 2023-10-31 21:39:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-31 21:39:43 +0000 |
| commit | e43bba16fcb3599b09a964b2019d197e3235934a (patch) | |
| tree | fe88ec22be18ce68a2c4b21a93dd80f129f32c24 | |
| parent | d45b5950197f00dd394ddb3b348ad2922970e350 (diff) | |
| parent | a73f9d3e0d448a3d28f0ccc3a757577c39f7aca5 (diff) | |
| download | Camera2-e43bba16fcb3599b09a964b2019d197e3235934a.tar.gz | |
Camera2: Do not pass location info for startActivity case am: 3c097bb0e5 am: a73f9d3e0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/25135945
Change-Id: Ib2b0b9bedbf2c8c1d5fb3241065c44c58d24e3f3
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 1a8134920..642acbab4 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1739,8 +1739,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 { |