From 1b35da1ccb06766bc56b9ead1b68b8c5fd8ba115 Mon Sep 17 00:00:00 2001 From: Andriy Naborskyy Date: Fri, 25 Mar 2022 05:22:01 +0000 Subject: [PATCH] data saver test exception for wear WearOs should not be treated as supporting Data Saver mode. Users can not enable or disable the mode. Data Saver is used on WearOs for battery improvements with LTE enabled devices but should not block WiFi or Bluetooth PROXY networks. Bug: 222086830 Test: run cts CtsHostsideNetworkTests Change-Id: I8e76f7f9574c1ef2c1bd04ff0be652a74cd241f9 (cherry picked from commit cf709bbae312ad7cd0ffdf64af0a8ce23d8b1610) --- .../android/cts/net/hostside/NetworkPolicyTestUtils.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyTestUtils.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyTestUtils.java index 89a9bd6664..b6218d2acc 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyTestUtils.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyTestUtils.java @@ -38,6 +38,7 @@ import android.app.ActivityManager; import android.app.Instrumentation; import android.app.UiAutomation; import android.content.Context; +import android.content.pm.PackageManager; import android.location.LocationManager; import android.net.ConnectivityManager; import android.net.ConnectivityManager.NetworkCallback; @@ -99,6 +100,10 @@ public class NetworkPolicyTestUtils { return mBatterySaverSupported; } + private static boolean isWear() { + return getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH); + } + /** * As per CDD requirements, if the device doesn't support data saver mode then * ConnectivityManager.getRestrictBackgroundStatus() will always return @@ -107,6 +112,9 @@ public class NetworkPolicyTestUtils { * RESTRICT_BACKGROUND_STATUS_DISABLED or not. */ public static boolean isDataSaverSupported() { + if (isWear()) { + return false; + } if (mDataSaverSupported == null) { assertMyRestrictBackgroundStatus(RESTRICT_BACKGROUND_STATUS_DISABLED); try {