diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-16 18:50:54 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-16 18:50:54 +0000 |
| commit | a74fb45595e105c926f28985c57a676e18b382e7 (patch) | |
| tree | 302b6122c52e92c64fbc4a1b6f7a19053e925af0 | |
| parent | b9945044810f574c4bf7b5fbb5b30d19ff4c2579 (diff) | |
| parent | 4ebd97f9639136684c13fefe26185e31e9d12567 (diff) | |
| download | Camera2-android-14.0.0_r21.tar.gz | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25135945'] into udc-qpr1-release.android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android14-qpr1-s2-releaseandroid14-qpr1-release
Change-Id: I41379dbc8be0dd9a9fce304a8ebb651556eb5244
| -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 { |