Remove "primary_directory" and "secondary_directory" from initial values
"primary_directory" and "secondary_directory" columns were removed in
R, hence if apps use these columns, enforceStrictColumns throws error.
so we need to remove them.
(Partially cherry-picked from Partner-CL)
Bug: 161418638
Test: N.A.
Change-Id: I4fdabf70868e04b0c9a58f3762baeae8551585ac
(cherry picked from commit d7d1584504753cd780464a0fd01e1611599a7eaa)
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index f2ed950..728a98b 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -3321,6 +3321,15 @@
if (initialValues.containsKey(ImageColumns.LONGITUDE)) {
initialValues.putNull(ImageColumns.LONGITUDE);
}
+ if (getCallingPackageTargetSdkVersion() <= Build.VERSION_CODES.Q) {
+ // These columns are removed in R.
+ if (initialValues.containsKey("primary_directory")) {
+ initialValues.remove("primary_directory");
+ }
+ if (initialValues.containsKey("secondary_directory")) {
+ initialValues.remove("secondary_directory");
+ }
+ }
if (isCallingPackageSelf() || isCallingPackageShell()) {
// When media inserted by ourselves during a scan, or by the
@@ -5142,6 +5151,15 @@
if (initialValues.containsKey(ImageColumns.LONGITUDE)) {
initialValues.putNull(ImageColumns.LONGITUDE);
}
+ if (getCallingPackageTargetSdkVersion() <= Build.VERSION_CODES.Q) {
+ // These columns are removed in R.
+ if (initialValues.containsKey("primary_directory")) {
+ initialValues.remove("primary_directory");
+ }
+ if (initialValues.containsKey("secondary_directory")) {
+ initialValues.remove("secondary_directory");
+ }
+ }
}
// If we're not updating anything, then we can skip
