PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not show Provisioning items for IMS if it is not enabled.

Browse Source 
Do not show IMS related items if FEATURE_TELEPHONY_IMS
is not defined for this device.

Bug: 118823723
Test: manual
Merged-In: I9624535fe766cd79eadb30502c1a0574650a02ef
Change-Id: I9624535fe766cd79eadb30502c1a0574650a02ef
This commit is contained in:
Brad Ebinger
2019-03-11 17:33:53 -07:00
parent 2a695c4b7b
commit 8bff9c3501
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/RadioInfo.java
View File

@@ -455,6 +455,13 @@ public class RadioInfo extends Activity {
imsWfcProvisionedSwitch = (Switch) findViewById(R.id.wfc_provisioned_switch); imsWfcProvisionedSwitch = (Switch) findViewById(R.id.wfc_provisioned_switch);
eabProvisionedSwitch = (Switch) findViewById(R.id.eab_provisioned_switch); eabProvisionedSwitch = (Switch) findViewById(R.id.eab_provisioned_switch);
if (!ImsManager.isImsSupportedOnDevice(phone.getContext())) {
imsVolteProvisionedSwitch.setVisibility(View.GONE);
imsVtProvisionedSwitch.setVisibility(View.GONE);
imsWfcProvisionedSwitch.setVisibility(View.GONE);
eabProvisionedSwitch.setVisibility(View.GONE);
}
radioPowerOnSwitch = (Switch) findViewById(R.id.radio_power); radioPowerOnSwitch = (Switch) findViewById(R.id.radio_power);
mDownlinkKbps = (TextView) findViewById(R.id.dl_kbps); mDownlinkKbps = (TextView) findViewById(R.id.dl_kbps);
@@ -604,8 +611,10 @@ public class RadioInfo extends Activity {
R.string.radioInfo_menu_viewFDN).setOnMenuItemClickListener(mViewFDNCallback); R.string.radioInfo_menu_viewFDN).setOnMenuItemClickListener(mViewFDNCallback);
menu.add(1, MENU_ITEM_VIEW_SDN, 0, menu.add(1, MENU_ITEM_VIEW_SDN, 0,
R.string.radioInfo_menu_viewSDN).setOnMenuItemClickListener(mViewSDNCallback); R.string.radioInfo_menu_viewSDN).setOnMenuItemClickListener(mViewSDNCallback);
if (ImsManager.isImsSupportedOnDevice(phone.getContext())) {
menu.add(1, MENU_ITEM_GET_IMS_STATUS, menu.add(1, MENU_ITEM_GET_IMS_STATUS,
0, R.string.radioInfo_menu_getIMS).setOnMenuItemClickListener(mGetImsStatus); 0, R.string.radioInfo_menu_getIMS).setOnMenuItemClickListener(mGetImsStatus);
}
menu.add(1, MENU_ITEM_TOGGLE_DATA, menu.add(1, MENU_ITEM_TOGGLE_DATA,
0, R.string.radio_info_data_connection_disable).setOnMenuItemClickListener(mToggleData); 0, R.string.radio_info_data_connection_disable).setOnMenuItemClickListener(mToggleData);
return true; return true;
@@ -1357,6 +1366,9 @@ public class RadioInfo extends Activity {
} }
private void updateImsProvisionedState() { private void updateImsProvisionedState() {
if (!ImsManager.isImsSupportedOnDevice(phone.getContext())) {
return;
}
log("updateImsProvisionedState isImsVolteProvisioned()=" + isImsVolteProvisioned()); log("updateImsProvisionedState isImsVolteProvisioned()=" + isImsVolteProvisioned());
//delightful hack to prevent on-checked-changed calls from //delightful hack to prevent on-checked-changed calls from
//actually forcing the ims provisioning to its transient/current value. //actually forcing the ims provisioning to its transient/current value.