Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure to read the opportunistic carrier display property

Browse Source 
Make sure to read the opportunistic carrier display property
Bug: 131849855
Test: verified that carrier text is displayed correctly

Change-Id: I93f9da8d0a9a8dae276370a0cca2df889229d4c3
This commit is contained in:
Sooraj Sasindran
2019-05-02 13:47:21 -07:00
parent 70c8685a94
commit b7d633b4a6
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/keyguard/CarrierTextController.java
View File

@@ -174,6 +174,9 @@ public class CarrierTextController {
mSimSlotsNumber = ((TelephonyManager) context.getSystemService(
Context.TELEPHONY_SERVICE)).getPhoneCount();
mSimErrorState = new boolean[mSimSlotsNumber];
updateDisplayOpportunisticSubscriptionCarrierText(SystemProperties.getBoolean(
TelephonyProperties.DISPLAY_OPPORTUNISTIC_SUBSCRIPTION_CARRIER_TEXT_PROPERTY_NAME,
false));
}
/**
@@ -282,10 +285,8 @@ public class CarrierTextController {
*
*/
@VisibleForTesting
public void updateDisplayOpportunisticSubscriptionCarrierText() {
mDisplayOpportunisticSubscriptionCarrierText = SystemProperties
.getBoolean(TelephonyProperties
.DISPLAY_OPPORTUNISTIC_SUBSCRIPTION_CARRIER_TEXT_PROPERTY_NAME, false);
public void updateDisplayOpportunisticSubscriptionCarrierText(boolean isEnable) {
mDisplayOpportunisticSubscriptionCarrierText = isEnable;
}
protected List<SubscriptionInfo> getSubscriptionInfo() {

8
packages/SystemUI/tests/src/com/android/keyguard/CarrierTextControllerTest.java
View File

@@ -118,6 +118,7 @@ public class CarrierTextControllerTest extends SysuiTestCase {
mKeyguardUpdateMonitor);
// This should not start listening on any of the real dependencies
mCarrierTextController.setListening(mCarrierTextCallback);
mCarrierTextController.updateDisplayOpportunisticSubscriptionCarrierText(false);
}
@Test
@@ -358,7 +359,7 @@ public class CarrierTextControllerTest extends SysuiTestCase {
.thenReturn(IccCardConstants.State.READY);
mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();
mCarrierTextController.updateDisplayOpportunisticSubscriptionCarrierText();
mCarrierTextController.updateDisplayOpportunisticSubscriptionCarrierText(true);
when(mSubscriptionManager.getActiveSubscriptionInfoList(anyBoolean())).thenReturn(list);
ArgumentCaptor<CarrierTextController.CarrierTextCallbackInfo> captor =
@@ -386,10 +387,5 @@ public class CarrierTextControllerTest extends SysuiTestCase {
super.setListening(callback);
mKeyguardUpdateMonitor = mKUM;
}
@Override
public void updateDisplayOpportunisticSubscriptionCarrierText() {
mDisplayOpportunisticSubscriptionCarrierText = true;
}
}
}