From f3d8c6f70e51c9047f227aa2e7562bcea51cda01 Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Mon, 14 Jun 2021 03:13:41 +0000 Subject: [PATCH] Avoid waiting unnecessarily if there is no data to return. Bug: 189790442 Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java Change-Id: I091991aac8eb11319bd60dc8f07124ace1ad52f1 --- .../hostside/AbstractRestrictBackgroundNetworkTestCase.java | 4 ++++ 1 file changed, 4 insertions(+) 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 1afbfb0ab1..7d30056be1 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 @@ -106,6 +106,8 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { private static final String KEY_NETWORK_STATE_OBSERVER = TEST_PKG + ".observer"; + private static final String EMPTY_STRING = ""; + protected static final int TYPE_COMPONENT_ACTIVTIY = 0; protected static final int TYPE_COMPONENT_FOREGROUND_SERVICE = 1; @@ -206,6 +208,8 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { final String resultData = getResultData(); if (resultData == null) { Log.e(TAG, "Received null data from ordered intent"); + // Offer an empty string so that the code waiting for the result can return. + result.offer(EMPTY_STRING); return; } result.offer(resultData);