| commit | 4dd5215d08bad85883e239c7f38692f7be49eacc | [log] [tgz] |
|---|---|---|
| author | Sudheer Shanka <sudheersai@google.com> | Fri Apr 15 18:24:26 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 15 18:24:26 2022 +0000 |
| tree | 171a709c888722d36fd1da0773321615009b6086 | |
| parent | bf4a720bfac81d1aadd34a3716675881c96ca278 [diff] | |
| parent | dccd4d04ad65b45928cb3b11a0a57ab924e93f04 [diff] |
Merge "Throw an error if a shell command results in an error." am: 90a74273e7 am: dccd4d04ad Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2064787 Change-Id: I3aa5b544baaad454ee34c3f28cfc88a24abdef65 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 e51fc7e..0a0f24b 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; }