commit | 506278967d60054fb408f2ba881c529add42c068 | [log] [tgz] |
---|---|---|
author | James Lin <jamescflin@google.com> | Fri Mar 26 01:17:17 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 26 01:17:17 2021 +0000 |
tree | 6a88213c521e8709d3b5ca00d8295e15ca89b84b | |
parent | 1c5be4cac8e31f76713af27ada114afe2608cbe1 [diff] | |
parent | 4ce6c6a010a6593643d99ebf08bb0e9d817b9201 [diff] |
Merge "Fix NullPointerException in the android.telephony.ims.cts.EabControllerTest" am: 4ce6c6a010 Original change: https://android-review.googlesource.com/c/platform/cts/+/1652628 Change-Id: I349c9c3a71192e5b8202a6880803b51f9fa0f710
diff --git a/tests/tests/telephony/current/src/android/telephony/ims/cts/EabControllerTest.java b/tests/tests/telephony/current/src/android/telephony/ims/cts/EabControllerTest.java index 2b613c6..5e0bcb0 100644 --- a/tests/tests/telephony/current/src/android/telephony/ims/cts/EabControllerTest.java +++ b/tests/tests/telephony/current/src/android/telephony/ims/cts/EabControllerTest.java
@@ -178,12 +178,12 @@ } sServiceConnector = null; + overrideCarrierConfig(null); + if (sReceiver != null) { InstrumentationRegistry.getInstrumentation().getContext().unregisterReceiver(sReceiver); sReceiver = null; } - - overrideCarrierConfig(null); } @Before