Merge "Avoid waiting unnecessarily if there is no data to return." into sc-dev am: 858dde4109

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15039587

Change-Id: I3225993e2ac623c991cbc21f5c00bf9df38149d7
This commit is contained in:
Sudheer Shanka
2021-06-21 19:58:05 +00:00
committed by Automerger Merge Worker

View File

@@ -126,6 +126,8 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase {
private static final String KEY_NETWORK_STATE_OBSERVER = TEST_PKG + ".observer";
private static final String KEY_SKIP_VALIDATION_CHECKS = TEST_PKG + ".skip_validation_checks";
private static final String EMPTY_STRING = "";
protected static final int TYPE_COMPONENT_ACTIVTIY = 0;
protected static final int TYPE_COMPONENT_FOREGROUND_SERVICE = 1;
protected static final int TYPE_EXPEDITED_JOB = 2;
@@ -229,6 +231,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);