diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index 85507f6d16..3a4d055a69 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -8021,6 +8021,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
                 }
             }
         }
+        if (!highestPriorityNri.isBeingSatisfied()) return null;
         return highestPriorityNri.getSatisfier();
     }
 
diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
index f85705ccc2..af0220ed26 100755
--- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
@@ -10230,9 +10230,8 @@ public class ConnectivityServiceTest {
             // request so LOST callback is received.
             defaultCallback.expect(LOST, mCellAgent);
             // Due to the VPN default request, getActiveNetworkInfo() gets the mNoServiceNetwork
-            // as the network satisfier which has TYPE_NONE.
-            // TODO: This should not be TYPE_NONE, see ConnectivityManager#getActiveNetworkInfo
-            assertActiveNetworkInfo(TYPE_NONE, DetailedState.BLOCKED);
+            // as the network satisfier.
+            assertNull(mCm.getActiveNetworkInfo());
         } else {
             assertActiveNetworkInfo(TYPE_MOBILE, DetailedState.BLOCKED);
         }
@@ -10314,9 +10313,8 @@ public class ConnectivityServiceTest {
         // While the VPN is reconnecting on the new network, everything is blocked.
         if (expectSetVpnDefaultForUids) {
             // Due to the VPN default request, getActiveNetworkInfo() gets the mNoServiceNetwork
-            // as the network satisfier which has TYPE_NONE.
-            // TODO: This should not be TYPE_NONE, see ConnectivityManager#getActiveNetworkInfo
-            assertActiveNetworkInfo(TYPE_NONE, DetailedState.BLOCKED);
+            // as the network satisfier.
+            assertNull(mCm.getActiveNetworkInfo());
         } else {
             assertActiveNetworkInfo(TYPE_WIFI, DetailedState.BLOCKED);
         }