commit 66ada729787dfcaa56ba7d18e21a1930449e7c8c
author Treehugger Robot <treehugger-gerrit@google.com> Fri Nov 13 01:11:23 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 13 01:11:23 2020 +0000
tree 3ea58ecb550ca363788ae04746263436b2368803
parent ba246f66d886683d2cdf4e420515e81e8a953cd0
parent 1c1fdcf2b9524683619776e023f2d92ef0a797f4

Merge "Camera: fix ISO/exposure time expecations" into pie-cts-dev

tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java

diff --git a/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java b/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java
index 7edb235..2ed0124 100644
--- a/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java
@@ -37,7 +37,6 @@
 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 @@
             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());

tests/tests/security/src/android/security/cts/StagefrightTest.java

diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java
index aae34ca..e53b85f 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -1353,7 +1353,11 @@
                     codec.release();
                 }
             }
-            ex.unselectTrack(t);
+            try {
+                ex.unselectTrack(t);
+            } catch (IllegalArgumentException e) {
+                // since we're just cleaning up, we don't care if it fails
+            }
         }
         ex.release();
         String cve = rname.replace("_", "-").toUpperCase();