Merge "Update "Allow 2G" toggle summary wording."

2021-12-23 15:43:05 +00:00
parent 11070ba729 91036f8945
commit c17bef1711
3 changed files with 43 additions and 4 deletions
--- a/tests/unit/src/com/android/settings/network/telephony/Enable2gPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/Enable2gPreferenceControllerTest.java
@@ -45,12 +45,12 @@ import org.mockito.MockitoAnnotations;
 public final class Enable2gPreferenceControllerTest {
    private static final int SUB_ID = 2;

+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
    @Mock
    private TelephonyManager mTelephonyManager;
    @Mock
    private TelephonyManager mInvalidTelephonyManager;
-    @Mock
-    private CarrierConfigManager mCarrierConfigManager;

    private PersistableBundle mPersistableBundle;
    private Enable2gPreferenceController mController;