diff options
| author | Shuzhen Wang <shuzhenwang@google.com> | 2023-11-01 01:06:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-01 01:06:13 +0000 |
| commit | c4cd166386ecc925dbc97e3f47eae2f5d92d2cb2 (patch) | |
| tree | 042a1484342bfedcf4a0951d90e06b9b0ad9df6c | |
| parent | 4d60bff648b1e7e2cffa02602f5d9c00ce5816a4 (diff) | |
| parent | f451da03d5fc768ebe3a07fa8a10a26153b85ffc (diff) | |
| download | Camera2-c4cd166386ecc925dbc97e3f47eae2f5d92d2cb2.tar.gz | |
Camera2: Do not pass location info for startActivity case am: 3c097bb0e5 am: a73f9d3e0d am: e43bba16fc am: ba5dd7a1af am: f451da03d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/25135945
Change-Id: I2c7f8059c3add52effe1c27835ea218d81808d2c
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 82b0953e7..701d86d89 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1735,8 +1735,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 { |