From 600da6fb6998a3f11139c7348fefa693373194d9 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Tue, 3 Nov 2020 02:55:06 +0000
Subject: [PATCH] DO NOT MERGE Revert "DO NOT MERGE CTS: Ensure
 CONFIGURED_NETWORKS_CHANGED_ACTION broadcast is received"

This reverts commit 5dd45ebc2bb91be162e751e9670a12e16f90b46e.

Reason for revert: b/171022033

Change-Id: Iefb0edbca0254a9d7ee03175196152278e19a7d2
---
 .../android/net/wifi/cts/WifiManagerTest.java | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
index 7edb235eb3..2ed012491e 100644
--- a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
@@ -37,7 +37,6 @@ import android.provider.Settings;
 import android.test.AndroidTestCase;
 import android.util.Log;
 
-import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.WifiConfigCreator;
 
 import java.net.HttpURLConnection;
@@ -457,34 +456,12 @@ public class WifiManagerTest extends AndroidTestCase {
             assertFalse(existSSID(SSID1));
             assertTrue(existSSID(SSID2));
 
-            // Need an effectively-final holder because we need to modify inner Intent in callback.
-            class IntentHolder {
-                Intent intent;
-            }
-            IntentHolder intentHolder = new IntentHolder();
-            mContext.registerReceiver(new BroadcastReceiver() {
-                @Override
-                public void onReceive(Context context, Intent intent) {
-                    Log.i(TAG, "Received CONFIGURED_NETWORKS_CHANGED_ACTION broadcast: " + intent);
-                    intentHolder.intent = intent;
-                }
-            }, new IntentFilter(WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION));
-
             // Remove a WifiConfig
             assertTrue(mWifiManager.removeNetwork(netId));
             assertFalse(mWifiManager.removeNetwork(notExist));
             assertFalse(existSSID(SSID1));
             assertFalse(existSSID(SSID2));
 
-            // Should receive CONFIGURED_NETWORKS_CHANGED_ACTION broadcast because CtsNetTestCases'
-            // AndroidManifest.xml has both ACCESS_WIFI_STATE & ACCESS_FINE_LOCATION permissions.
-            PollingCheck.check(
-                    "Didn't receive CONFIGURED_NETWORKS_CHANGED_ACTION broadcast!",
-                    DURATION,
-                    () -> intentHolder.intent != null);
-            Intent intent = intentHolder.intent;
-            assertEquals(WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION, intent.getAction());
-
             assertTrue(mWifiManager.saveConfiguration());
         } finally {
             reEnableNetworks(enabledSsids, mWifiManager.getConfiguredNetworks());