Merge "[NS03] Mix in other CS-managed properties"

2021-03-19 10:32:46 +00:00
parent 46e3f1822d 395bde4d5f
commit e07e3856da
9 changed files with 324 additions and 52 deletions
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -4328,6 +4328,7 @@ public class ConnectivityServiceTest {
        assertTrue(mPolicyTracker.shouldNotifyWifiUnvalidated());
    }

+    @Ignore("Refactoring in progress b/178071397")
    @Test
    public void testAvoidBadWifi() throws Exception {
        final ContentResolver cr = mServiceContext.getContentResolver();