commit 735b89804878af5dae31d6884b0818bdfb271d0c
author Xin Li <delphij@google.com> Sat Jun 06 01:41:31 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jun 06 01:41:31 2020 +0000
tree f5e840af0c8e50e398540cdb1377b3b0fdaa869c
parent f04920cf9912f0b4276d48d1b408ae0e04848898
parent a1fde5a73099c91a7b79f0d7037cbf9060a45881

Merge "Merge QQ3A.200605.002 into master"

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 11005a4..97697fd 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -4504,7 +4504,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));