commit 06e4a5da9c5848ea3fa3087fee5a40b3f190b405
author Jean Chalard <jchalard@google.com> Tue Feb 22 19:32:54 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 22 19:32:54 2022 +0000
tree 090198488017cd1cfa76852090f89f3edb82dbed
parent 27e8f14721a7ec50b51add88c5fd8494f9edf4fd
parent 25ef7c24909bc4a0f39a18bc63318523265c5763

Merge "Fix : recent Connectivity module with old NetworkStack module"

common/networkstackclient/src/android/net/networkstack/ModuleNetworkStackClient.java

diff --git a/common/networkstackclient/src/android/net/networkstack/ModuleNetworkStackClient.java b/common/networkstackclient/src/android/net/networkstack/ModuleNetworkStackClient.java
index cbbae37..c3079fe 100644
--- a/common/networkstackclient/src/android/net/networkstack/ModuleNetworkStackClient.java
+++ b/common/networkstackclient/src/android/net/networkstack/ModuleNetworkStackClient.java
@@ -44,9 +44,7 @@
      */
     @NonNull
     public static synchronized ModuleNetworkStackClient getInstance(Context packageContext) {
-        // TODO(b/149676685): change this check to "< R" once R is defined
-        if (SDK_INT < Build.VERSION_CODES.Q
-                || (SDK_INT == Build.VERSION_CODES.Q && "REL".equals(Build.VERSION.CODENAME))) {
+        if (SDK_INT < Build.VERSION_CODES.R) {
             // The NetworkStack connector is not available through NetworkStack before R
             throw new UnsupportedOperationException(
                     "ModuleNetworkStackClient is not supported on API " + SDK_INT);