commit 8c85f48c3c1e254b4edfc4813d3bb9772aa16a65
author Sahana Rao <sahanas@google.com> Mon Mar 07 12:16:15 2022 +0000
committer Sahana Rao <sahanas@google.com> Mon Mar 07 17:49:29 2022 +0000
tree 978941c030a02aaf770dea2f02ea10965a60cfd5
parent d748bd65af323f14d737062b1f36abdce9f99954

Remove Picker db=false paths in CtsPhotoPickerTest

Bug: 220705319
Test: presubmit
Change-Id: I7f2c99f97cee513becec40da10ef4cdb191b05f3

tests/PhotoPicker/src/android/photopicker/cts/util/PhotoPickerAssertionsUtils.java

diff --git a/tests/PhotoPicker/src/android/photopicker/cts/util/PhotoPickerAssertionsUtils.java b/tests/PhotoPicker/src/android/photopicker/cts/util/PhotoPickerAssertionsUtils.java
index a9894a9..86b571f 100644
--- a/tests/PhotoPicker/src/android/photopicker/cts/util/PhotoPickerAssertionsUtils.java
+++ b/tests/PhotoPicker/src/android/photopicker/cts/util/PhotoPickerAssertionsUtils.java
@@ -16,8 +16,6 @@
 
 package android.photopicker.cts.util;
 
-import static android.os.SystemProperties.getBoolean;
-import static android.provider.MediaStore.Files.FileColumns;
 import static android.provider.MediaStore.PickerMediaColumns;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -73,12 +71,7 @@
             assertThat(c).isNotNull();
             assertThat(c.moveToFirst()).isTrue();
 
-            final String mimeType;
-            if (getBoolean("sys.photopicker.pickerdb.enabled", true)) {
-                mimeType = c.getString(c.getColumnIndex(PickerMediaColumns.MIME_TYPE));
-            } else {
-                mimeType = c.getString(c.getColumnIndex(FileColumns.MIME_TYPE));
-            }
+            final String mimeType = c.getString(c.getColumnIndex(PickerMediaColumns.MIME_TYPE));
 
             if (mimeType.startsWith("image")) {
                 assertImageRedactedReadOnlyAccess(uri, resolver);