diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-01 11:17:21 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-01 11:17:21 +0000 |
| commit | 6fa0c1d23bf38a600982943876627338477ebb0e (patch) | |
| tree | 302b6122c52e92c64fbc4a1b6f7a19053e925af0 | |
| parent | 41e76ba4acac79ddf8d9cd778b32db0c8ff56ee9 (diff) | |
| parent | 2158494c49997954a7f169ded4068101e8da26b2 (diff) | |
| download | Camera2-android14-mainline-conscrypt-release.tar.gz | |
Snap for 11034692 from 2158494c49997954a7f169ded4068101e8da26b2 to mainline-conscrypt-releaseaml_con_341614000aml_con_341511080aml_con_341410300aml_con_341310090android14-mainline-conscrypt-release
Change-Id: Ia45e3bf3bf49b78cdc53cb5dba4dd47bb5a8e91d
| -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 { |