commit 1a4fe34eb1c6cd48b23b7d6e8679ad72300ce356
author Jeff Sharkey <jsharkey@android.com> Mon Mar 09 15:50:05 2020 -0600
committer Jeff Sharkey <jsharkey@android.com> Tue Mar 10 11:16:12 2020 -0600
tree c52625dceaed9998161aa859beddc7ee877d3b60
parent b688afe8d76fb4fc2d814e57b63e791199e74f02

Follow API refactoring.

Bug: 150939131
Test: atest --test-mapping packages/providers/MediaProvider
Test: atest FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest
Change-Id: I9fe22ae3eee130d9bc50512ff913889cae9b65a3

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

diff --git a/src/com/android/providers/media/DatabaseHelper.java b/src/com/android/providers/media/DatabaseHelper.java
index 99e6c31..6b81990 100644
--- a/src/com/android/providers/media/DatabaseHelper.java
+++ b/src/com/android/providers/media/DatabaseHelper.java
@@ -70,6 +70,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
@@ -490,7 +491,7 @@
         }
     }
 
-    private void notifyChangeInternal(@NonNull Iterable<Uri> uris, int flags) {
+    private void notifyChangeInternal(@NonNull Collection<Uri> uris, int flags) {
         Trace.beginSection("notifyChange");
         try {
             mContext.getContentResolver().notifyChange(uris, null, flags);

tests/client/src/com/android/providers/media/client/PerformanceTest.java

diff --git a/tests/client/src/com/android/providers/media/client/PerformanceTest.java b/tests/client/src/com/android/providers/media/client/PerformanceTest.java
index d587c1b..b761d2d 100644
--- a/tests/client/src/com/android/providers/media/client/PerformanceTest.java
+++ b/tests/client/src/com/android/providers/media/client/PerformanceTest.java
@@ -36,6 +36,7 @@
 import org.junit.runner.RunWith;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
@@ -230,10 +231,8 @@
         MediaStore.waitForIdle(resolver);
     }
 
-    private static Set<Uri> asSet(Iterable<Uri> uris) {
-        final Set<Uri> asSet = new HashSet<>();
-        uris.forEach(asSet::add);
-        return asSet;
+    private static Set<Uri> asSet(Collection<Uri> uris) {
+        return new HashSet<>(uris);
     }
 
     /**
@@ -308,7 +307,7 @@
         }
 
         @Override
-        public void onChange(boolean selfChange, Iterable<Uri> uris, int flags) {
+        public void onChange(boolean selfChange, Collection<Uri> uris, int flags) {
             Log.v(TAG, String.format("onChange(%b, %s, %d)",
                     selfChange, asSet(uris).toString(), flags));