Merge "Fix ConnectivityManager memory leak"

2022-05-03 02:46:05 +00:00
parent 15b83ab323 d201566169
commit 8e3b96b61f
2 changed files with 19 additions and 4 deletions
--- a/tests/unit/java/android/net/ConnectivityManagerTest.java
+++ b/tests/unit/java/android/net/ConnectivityManagerTest.java
@@ -41,6 +41,7 @@ import static com.android.testutils.MiscAsserts.assertThrows;

 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -506,8 +507,7 @@ public class ConnectivityManagerTest {
            Thread.sleep(waitIntervalMs);
        }

-        // TODO: fix memory leak then assertNull here.
-        assertNotNull("Couldn't find the Context leak in ConnectivityManager after " + attempts
-                + " attempts", ref.get());
+        assertNull("ConnectivityManager weak reference still not null after " + attempts
+                    + " attempts", ref.get());
    }
 }