Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31c56603 authored by Hugo Benichi's avatar Hugo Benichi Committed by android-build-merger
Browse files

Merge "Fix NetworkNotificationManagerTest" am: c13a80de 

am: 13f0d101

Change-Id: Icf4e4e9c9dde7f6c8308adb79e3ca8b63d6f604b
parents 80eb47ff 13f0d101

tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java

+4 −3
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public class NetworkNotificationManagerTest extends TestCase { 
        final int NETWORK_ID_BASE = 100;

        List<NotificationType> types = Arrays.asList(NotificationType.values());

        List<Integer> ids = new ArrayList<>(types.size());

        for (int i = 0; i < ids.size(); i++) {

        for (int i = 0; i < types.size(); i++) {

            ids.add(NETWORK_ID_BASE + i);

        }

        Collections.shuffle(ids);
@@ -101,9 +101,10 @@ public class NetworkNotificationManagerTest extends TestCase { 
            mManager.showNotification(ids.get(i), types.get(i), mWifiNai, mCellNai, null, false);

        }



        Collections.shuffle(ids);

        List<Integer> idsToClear = new ArrayList<>(ids);

        Collections.shuffle(idsToClear);

        for (int i = 0; i < ids.size(); i++) {

            mManager.clearNotification(ids.get(i));

            mManager.clearNotification(idsToClear.get(i));

        }



        for (int i = 0; i < ids.size(); i++) {