commit dc4cb146315240441fc8d9c05fe8dd63370a7c57
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 02 12:52:16 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 02 12:52:16 2018 +0000
tree 89e06cb7bd68cb11f363841d79a605ecaf90af93
parent abf7b71fe8cc7a0220e5f3508bba7905e4ed59b6
parent 97331d678a9002f498f43d7e03ef382dddfce3fb

Merge "Replace listFromArray with setFromArray as return type is updated"

services/tests/servicestests/src/com/android/server/devicepolicy/OverlayPackagesProviderTest.java

diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/OverlayPackagesProviderTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/OverlayPackagesProviderTest.java
index 4447fe9..939a272 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/OverlayPackagesProviderTest.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/OverlayPackagesProviderTest.java
@@ -261,7 +261,7 @@
     }
 
     private void verifyAppsAreNonRequired(String action, String... appArray) {
-        assertEquals(listFromArray(appArray),
+        assertEquals(setFromArray(appArray),
                 mHelper.getNonRequiredApps(TEST_MDM_COMPONENT_NAME, TEST_USER_ID, action));
     }
 
@@ -347,14 +347,7 @@
         if (array == null) {
             return null;
         }
-        return new HashSet<T>(Arrays.asList(array));
-    }
-
-    private <T> List<T> listFromArray(T... array) {
-        if (array == null) {
-            return null;
-        }
-        return Arrays.asList(array);
+        return new HashSet<>(Arrays.asList(array));
     }
 
     class FakePackageManager extends MockPackageManager {