Merge "Replace listFromArray with setFromArray as return type is updated" (dc4cb146) · Commits · e / os / android_frameworks_base

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

+2 −9

Original line number	Diff line number	Diff line
		@@ -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 {