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

Merge "Improve error reporting in ConnDiags tests" am: 01aa602a3f

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

Change-Id: Iba9d717b4e04e7798881a376d1425b6f2e750ab6
This commit is contained in:
Jean Chalard
2021-12-21 13:03:02 +00:00
committed by Automerger Merge Worker
parent 5611484dc1 01aa602a3f
commit 78a9b27ca5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/cts/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java
View File

@@ -40,6 +40,7 @@ import static android.net.cts.util.CtsNetUtils.TestNetworkCallback;
import static com.android.compatibility.common.util.SystemUtil.callWithShellPermissionIdentity; import static com.android.compatibility.common.util.SystemUtil.callWithShellPermissionIdentity;
import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity; import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
import static com.android.testutils.Cleanup.testAndCleanup;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
@@ -224,16 +225,16 @@ public class ConnectivityDiagnosticsManagerTest {
final TestNetworkCallback testNetworkCallback = new TestNetworkCallback(); final TestNetworkCallback testNetworkCallback = new TestNetworkCallback();
try { testAndCleanup(() -> {
doBroadcastCarrierConfigsAndVerifyOnConnectivityReportAvailable( doBroadcastCarrierConfigsAndVerifyOnConnectivityReportAvailable(
subId, carrierConfigReceiver, testNetworkCallback); subId, carrierConfigReceiver, testNetworkCallback);
} finally { }, () -> {
runWithShellPermissionIdentity( runWithShellPermissionIdentity(
() -> mCarrierConfigManager.overrideConfig(subId, null), () -> mCarrierConfigManager.overrideConfig(subId, null),
android.Manifest.permission.MODIFY_PHONE_STATE); android.Manifest.permission.MODIFY_PHONE_STATE);
mConnectivityManager.unregisterNetworkCallback(testNetworkCallback); mConnectivityManager.unregisterNetworkCallback(testNetworkCallback);
mContext.unregisterReceiver(carrierConfigReceiver); mContext.unregisterReceiver(carrierConfigReceiver);
} });
} }
private String getCertHashForThisPackage() throws Exception { private String getCertHashForThisPackage() throws Exception {