| commit | 0c4067f8f345c3c537c22f3e9ec9c244908298c5 | [log] [tgz] |
|---|---|---|
| author | Suprabh Shukla <suprabh@google.com> | Thu Mar 14 22:16:51 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 14 22:16:51 2024 +0000 |
| tree | 891515abde8e14cc629cbf9281945b912c0091e1 | |
| parent | b31c823365c729f1998372c2ef26477755d3628e [diff] | |
| parent | ddeec3a7adbb895032b86481961fac2ba8226b09 [diff] |
Merge "Revert^4 "Re-enable the tests for background restrictions"" into main am: ddeec3a7ad Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2994813 Change-Id: Ibe6adbd59a3911a0766c73b6b6cac8799b4cc63b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java index 1241e18..2ca8832 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
@@ -160,10 +160,6 @@ private static final long BROADCAST_TIMEOUT_MS = 5_000; - // Should be kept in sync with the constant in NetworkPolicyManagerService. - // TODO: b/322115994 - remove once the feature is in staging. - private static final boolean ALWAYS_RESTRICT_BACKGROUND_NETWORK = false; - protected Context mContext; protected Instrumentation mInstrumentation; protected ConnectivityManager mCm; @@ -233,8 +229,9 @@ } final String output = executeShellCommand("device_config get backstage_power" + " com.android.server.net.network_blocked_for_top_sleeping_and_above"); - return Boolean.parseBoolean(output) && ALWAYS_RESTRICT_BACKGROUND_NETWORK; + return Boolean.parseBoolean(output); } + protected int getUid(String packageName) throws Exception { return mContext.getPackageManager().getPackageUid(packageName, 0); }