commit afa18f02560117e3b770814cc525963fbfaf465a
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 22 10:37:29 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 22 10:37:29 2021 +0000
tree 6d89d90635559a215d5447bfb4319ec683724626
parent f754671f07933d31c5b76b6d0579be248380a2f0
parent e26bbf8032260b300ec766ec3b72eddd359502d1

Merge "Fix CTS test failed on R device"

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index d8d4b59..ce874d1 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -109,6 +109,7 @@
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.internal.util.ArrayUtils;
+import com.android.modules.utils.build.SdkLevel;
 import com.android.testutils.DevSdkIgnoreRule;
 import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
 import com.android.testutils.RecorderCallback.CallbackEntry;
@@ -521,11 +522,12 @@
         mCm.registerDefaultNetworkCallback(defaultTrackingCallback);
 
         final TestNetworkCallback systemDefaultTrackingCallback = new TestNetworkCallback();
-        runWithShellPermissionIdentity(() ->
-                mCm.registerSystemDefaultNetworkCallback(systemDefaultTrackingCallback,
-                        new Handler(Looper.getMainLooper())),
-                NETWORK_SETTINGS);
-
+        if (SdkLevel.isAtLeastS()) {
+            runWithShellPermissionIdentity(() ->
+                    mCm.registerSystemDefaultNetworkCallback(systemDefaultTrackingCallback,
+                            new Handler(Looper.getMainLooper())),
+                    NETWORK_SETTINGS);
+        }
 
         Network wifiNetwork = null;
 
@@ -542,16 +544,20 @@
             assertNotNull("Did not receive onAvailable on default network callback",
                     defaultTrackingCallback.waitForAvailable());
 
-            assertNotNull("Did not receive onAvailable on system default network callback",
-                    systemDefaultTrackingCallback.waitForAvailable());
+            if (SdkLevel.isAtLeastS()) {
+                assertNotNull("Did not receive onAvailable on system default network callback",
+                        systemDefaultTrackingCallback.waitForAvailable());
+            }
         } catch (InterruptedException e) {
             fail("Broadcast receiver or NetworkCallback wait was interrupted.");
         } finally {
             mCm.unregisterNetworkCallback(callback);
             mCm.unregisterNetworkCallback(defaultTrackingCallback);
-            runWithShellPermissionIdentity(
-                    () -> mCm.unregisterNetworkCallback(systemDefaultTrackingCallback),
-                    NETWORK_SETTINGS);
+            if (SdkLevel.isAtLeastS()) {
+                runWithShellPermissionIdentity(
+                        () -> mCm.unregisterNetworkCallback(systemDefaultTrackingCallback),
+                        NETWORK_SETTINGS);
+            }
         }
     }