commit 4ef9e0ca633bb2bbed84d9233eef6f0efef574c2
author Nandana Dutt <nandana@google.com> Fri Mar 20 10:59:16 2020 +0000
committer Bill Strathearn <bills@google.com> Fri Mar 20 18:09:00 2020 +0000
tree 87bbd7777e222faf15b2436ee9e694dcdc35719c
parent db6ff5d91f0f6a91af664142509f2fa9e1cb6ade

DO NOT MERGE

Guard the camera workaround with a targetsdk check

BUG: 149569689
Test: portrait shots by camera show up in gallery
Change-Id: I63d1412a9e0c3dfdcad2199dfd871f4b8956234e
Merged-In: I63d1412a9e0c3dfdcad2199dfd871f4b8956234e

src/com/android/providers/media/MediaProvider.java

diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 8928999..3b98ab8 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -4491,7 +4491,10 @@
 
     private int updateInternal(Uri uri, ContentValues initialValues, String userWhere,
             String[] userWhereArgs) {
-        if ("com.google.android.GoogleCamera".equals(getCallingPackageOrSelf())) {
+        // Limit the hacky workaround to camera targeting Q and below, to allow newer versions
+        // of camera that does the right thing to work correctly.
+        if ("com.google.android.GoogleCamera".equals(getCallingPackageOrSelf())
+                && getCallingPackageTargetSdkVersion() <= Build.VERSION_CODES.Q) {
             if (matchUri(uri, false) == IMAGES_MEDIA_ID) {
                 Log.w(TAG, "Working around app bug in b/111966296");
                 uri = MediaStore.Files.getContentUri("external", ContentUris.parseId(uri));