LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Invoke setDataEnabled instead of setDataEnabledForReason on R device" into main

Browse Source
This commit is contained in:
Junyu Lai
2023-09-07 01:36:58 +00:00
committed by Gerrit Code Review
parent d70a33061e 59ce1f1fcc
commit 7145c5c1fe
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
View File

@@ -65,6 +65,7 @@ import androidx.annotation.Nullable;
import com.android.compatibility.common.util.PollingCheck; import com.android.compatibility.common.util.PollingCheck;
import com.android.compatibility.common.util.ShellIdentityUtils; import com.android.compatibility.common.util.ShellIdentityUtils;
import com.android.compatibility.common.util.SystemUtil; import com.android.compatibility.common.util.SystemUtil;
import com.android.modules.utils.build.SdkLevel;
import com.android.net.module.util.ConnectivitySettingsUtils; import com.android.net.module.util.ConnectivitySettingsUtils;
import com.android.testutils.ConnectUtil; import com.android.testutils.ConnectUtil;
@@ -590,8 +591,12 @@ public final class CtsNetUtils {
callback.waitForAvailable()); callback.waitForAvailable());
} }
runAsShell(MODIFY_PHONE_STATE, () -> tm.setDataEnabledForReason( if (SdkLevel.isAtLeastS()) {
TelephonyManager.DATA_ENABLED_REASON_USER, enabled)); runAsShell(MODIFY_PHONE_STATE, () -> tm.setDataEnabledForReason(
TelephonyManager.DATA_ENABLED_REASON_USER, enabled));
} else {
runAsShell(MODIFY_PHONE_STATE, () -> tm.setDataEnabled(enabled));
}
if (enabled) { if (enabled) {
assertNotNull("Enabling mobile data did not connect mobile data", assertNotNull("Enabling mobile data did not connect mobile data",
callback.waitForAvailable()); callback.waitForAvailable());