| commit | abe9d91118f3d4ce139fcb85c408b630deeb508f | [log] [tgz] |
|---|---|---|
| author | Sudheer Shanka <sudheersai@google.com> | Fri Apr 15 18:31:55 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 15 18:31:55 2022 +0000 |
| tree | bbad8a0239c88cedd8972eb83c6a948c0ab66620 | |
| parent | 9004ac103c585a6b67e82fb2499cc35dda7c95c5 [diff] | |
| parent | 785433678a7e3aa358adbf0b8a0b4c6c5627249d [diff] |
Merge "Throw an error if a shell command results in an error." am: 90a74273e7 am: 785433678a Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2064787 Change-Id: I8f27d3017823bd5d62cc557dea556ad9a2e4bf6e 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/NetworkPolicyTestUtils.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyTestUtils.java index b6218d2..56be3e3 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
@@ -25,7 +25,7 @@ import static android.net.wifi.WifiConfiguration.METERED_OVERRIDE_METERED; import static android.net.wifi.WifiConfiguration.METERED_OVERRIDE_NONE; -import static com.android.compatibility.common.util.SystemUtil.runShellCommand; +import static com.android.compatibility.common.util.SystemUtil.runShellCommandOrThrow; import static com.android.cts.net.hostside.AbstractRestrictBackgroundNetworkTestCase.TAG; import static org.junit.Assert.assertEquals; @@ -390,7 +390,7 @@ } public static String executeShellCommand(String command) { - final String result = runShellCommand(command).trim(); + final String result = runShellCommandOrThrow(command).trim(); Log.d(TAG, "Output of '" + command + "': '" + result + "'"); return result; }