LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Avoid waiting unnecessarily if there is no data to return." am: 7184887d71 am: 16063e8281

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735977

Change-Id: I7a952ff80ce9f68c6a7a6a432799cc1b5b7d1b49
This commit is contained in:
Sudheer Shanka
2021-06-14 19:13:27 +00:00
committed by Automerger Merge Worker
parent ab4b8bc600 16063e8281
commit 7b45312b50
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
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_NETWORK_STATE_OBSERVER = TEST_PKG + ".observer";
private static final String KEY_SKIP_VALIDATION_CHECKS = TEST_PKG + ".skip_validation_checks"; 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_ACTIVTIY = 0;
protected static final int TYPE_COMPONENT_FOREGROUND_SERVICE = 1; protected static final int TYPE_COMPONENT_FOREGROUND_SERVICE = 1;
protected static final int TYPE_EXPEDITED_JOB = 2; protected static final int TYPE_EXPEDITED_JOB = 2;
@@ -229,6 +231,8 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase {
final String resultData = getResultData(); final String resultData = getResultData();
if (resultData == null) { if (resultData == null) {
Log.e(TAG, "Received null data from ordered intent"); 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; return;
} }
result.offer(resultData); result.offer(resultData);