diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-10 01:33:55 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-10 01:33:55 +0000 |
| commit | 15e3d1b467d33e9fa220775552006b15bf88d535 (patch) | |
| tree | 5131870eaea4cc3df01669602fcb5c5985487e62 | |
| parent | 91bea81aa62d95fb5cae02ed50793efdea2fb6d4 (diff) | |
| parent | 140c93d96ef3693c1bb318823192329dde754808 (diff) | |
| download | MediaProvider-15e3d1b467d33e9fa220775552006b15bf88d535.tar.gz | |
Snap for 10098552 from 140c93d96ef3693c1bb318823192329dde754808 to udc-release
Change-Id: I84dcf0d98ebeb028339fc097acb635f79511c5fa
| -rw-r--r-- | src/com/android/providers/media/MediaProvider.java | 3 | ||||
| -rw-r--r-- | tests/src/com/android/providers/media/photopicker/espresso/NoItemsTest.java | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java index f006c3f28..fdc39fcff 100644 --- a/src/com/android/providers/media/MediaProvider.java +++ b/src/com/android/providers/media/MediaProvider.java @@ -6716,9 +6716,6 @@ public class MediaProvider extends ContentProvider { return bundle; } case MediaStore.RUN_IDLE_MAINTENANCE_FOR_STABLE_URIS: { - getContext().enforceCallingPermission(Manifest.permission.WRITE_MEDIA_STORAGE, - "Permission missing to call RUN_IDLE_MAINTENANCE_FOR_STABLE_URIS by " - + "uid:" + Binder.getCallingUid()); backupDatabases(null); return new Bundle(); } diff --git a/tests/src/com/android/providers/media/photopicker/espresso/NoItemsTest.java b/tests/src/com/android/providers/media/photopicker/espresso/NoItemsTest.java index 8b5597560..969707756 100644 --- a/tests/src/com/android/providers/media/photopicker/espresso/NoItemsTest.java +++ b/tests/src/com/android/providers/media/photopicker/espresso/NoItemsTest.java @@ -59,7 +59,7 @@ public class NoItemsTest extends PhotoPickerBaseTest { PhotoPickerBaseTest.getSingleSelectionIntent())) { final int pickerTabRecyclerViewId = R.id.picker_tab_recyclerview; - onView(withId(pickerTabRecyclerViewId)).check(matches(not(isDisplayed()))); + onView(allOf(withId(pickerTabRecyclerViewId))).check(matches(not(isDisplayed()))); onView(withId(android.R.id.empty)).check(matches(isDisplayed())); onView(withText(R.string.picker_photos_empty_message)).check(matches(isDisplayed())); @@ -67,7 +67,7 @@ public class NoItemsTest extends PhotoPickerBaseTest { onView(allOf(withText(R.string.picker_albums), isDescendantOfA(withId(R.id.tab_layout)))).perform(click()); - onView(withId(pickerTabRecyclerViewId)).check(matches(not(isDisplayed()))); + onView(allOf(withId(pickerTabRecyclerViewId))).check(matches(not(isDisplayed()))); onView(withId(android.R.id.empty)).check(matches(isDisplayed())); onView(withText(R.string.picker_albums_empty_message)).check(matches(isDisplayed())); } |