| commit | 1522e0d0ffd0c7e0ab0d81ac6aa299b78df1d3b0 | [log] [tgz] |
|---|---|---|
| author | Suprabh Shukla <suprabh@google.com> | Wed Feb 21 06:20:44 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 21 06:20:44 2024 +0000 |
| tree | 3e28263542c1eb71454e90c2daf6f5771fd64daa | |
| parent | 65ba2e69bdc32bbff2ecc0a3ffc49896be0ddcda [diff] | |
| parent | 375f6bba818d69ed6082bb670df0e795bccef752 [diff] |
Re-enable the tests for background restrictions am: 375f6bba81 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2970571 Change-Id: I999be7b8b11e431f3eaaa3bc9ada0b3d3f6ffe5a 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); }