commit 59ce1f1fcce4964ccf8092e4036787da854800da
author Junyu Lai <junyulai@google.com> Wed Sep 06 10:52:18 2023 +0800
committer Junyu Lai <junyulai@google.com> Wed Sep 06 10:52:18 2023 +0800
tree 67e86923ed944623443d4605e90bb34f242867e6
parent 72bbb446efad41c617faf51707ec37132a167607

Invoke setDataEnabled instead of setDataEnabledForReason on R device

There was no such method in R release, use SdkLevel to check
framework version and use different API accordingly.

Test: TH
Fix: 297768044
Change-Id: I357c0d56646ffd5eb018b6bb4efe47d4c48e71d3

tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java

diff --git a/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java b/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
index aa09b84..96330e2 100644
--- a/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
+++ b/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
@@ -65,6 +65,7 @@
 import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.ShellIdentityUtils;
 import com.android.compatibility.common.util.SystemUtil;
+import com.android.modules.utils.build.SdkLevel;
 import com.android.net.module.util.ConnectivitySettingsUtils;
 import com.android.testutils.ConnectUtil;
 
@@ -590,8 +591,12 @@
                         callback.waitForAvailable());
             }
 
-            runAsShell(MODIFY_PHONE_STATE, () -> tm.setDataEnabledForReason(
-                    TelephonyManager.DATA_ENABLED_REASON_USER, enabled));
+            if (SdkLevel.isAtLeastS()) {
+                runAsShell(MODIFY_PHONE_STATE, () -> tm.setDataEnabledForReason(
+                        TelephonyManager.DATA_ENABLED_REASON_USER, enabled));
+            } else {
+                runAsShell(MODIFY_PHONE_STATE, () -> tm.setDataEnabled(enabled));
+            }
             if (enabled) {
                 assertNotNull("Enabling mobile data did not connect mobile data",
                         callback.waitForAvailable());