From 97331d678a9002f498f43d7e03ef382dddfce3fb Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Tue, 2 Jan 2018 11:08:25 +0000
Subject: [PATCH] Replace listFromArray with setFromArray as return type is
 updated

Bug: 71335613
Test: OverlayPackagesProviderTest passed
Change-Id: I345b5c736ea830c29bb7b3072f580aac90ab9f46
---
 .../devicepolicy/OverlayPackagesProviderTest.java     | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

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 4447fe91e34e2..939a2725fb07e 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 @@ public class OverlayPackagesProviderTest extends AndroidTestCase {
     }
 
     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 @@ public class OverlayPackagesProviderTest extends AndroidTestCase {
         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 {