commit 1ba4d0188960ac5376e1472459e49df5a57019cc
author David Su <dysu@google.com> Tue Mar 23 12:05:05 2021 -0700
committer David Su <dysu@google.com> Tue Mar 23 12:05:05 2021 -0700
tree 85638ecdbabd59d6d7084573aa27062563e4fb55
parent a1e6a290f23b89b802e4da40cc6ca6a044e8a88a

WifiInfo.isPrimary(): Add SdkLevel check

Bug: 179512200
Test: presubmit
Change-Id: I0c6fdea871c8088c7a654c5300bd610b85634de3

service/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java

diff --git a/service/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java b/service/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
index d539e70..6adf758 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
@@ -2413,10 +2413,12 @@
         assertEquals(WifiConfiguration.INVALID_NETWORK_ID, connectionInfo.getNetworkId());
         assertNull(connectionInfo.getPasspointFqdn());
         assertNull(connectionInfo.getPasspointProviderFriendlyName());
-        try {
-            connectionInfo.isPrimary();
-            fail();
-        } catch (SecurityException e) { /* pass */ }
+        if (SdkLevel.isAtLeastS()) {
+            try {
+                connectionInfo.isPrimary();
+                fail();
+            } catch (SecurityException e) { /* pass */ }
+        }
     }
 
     /**