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

Merge "[Settings] More log to help analysis" into sc-dev

Browse Source
This commit is contained in:
Bonian Chen
2021-04-07 18:11:32 +00:00
committed by Android (Google) Code Review
parent 8477cf1892 998554d68f
commit 44a45f0c49
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/network/telephony/BackupCallingPreferenceController.java
View File

@@ -149,10 +149,16 @@ public class BackupCallingPreferenceController extends TelephonyTogglePreference
private boolean hasBackupCallingFeature(int subscriptionId) { private boolean hasBackupCallingFeature(int subscriptionId) {
PersistableBundle carrierConfig = getCarrierConfigForSubId(subscriptionId); PersistableBundle carrierConfig = getCarrierConfigForSubId(subscriptionId);
return (carrierConfig != null) Boolean featureEnableStatus = null;
&& carrierConfig.getBoolean( if (carrierConfig != null) {
featureEnableStatus = carrierConfig.getBoolean(
CarrierConfigManager.KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL, false); CarrierConfigManager.KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL, false);
} }
// TODO: remove log after fixing b/182326102
Log.d(LOG_TAG, "config " + CarrierConfigManager.KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL
+ "=" + featureEnableStatus + " for subId=" + mSubId);
return (featureEnableStatus != null) && featureEnableStatus.booleanValue();
}
private ImsMmTelManager getImsMmTelManager(int subId) { private ImsMmTelManager getImsMmTelManager(int subId) {
if (!SubscriptionManager.isUsableSubscriptionId(subId)) { if (!SubscriptionManager.isUsableSubscriptionId(subId)) {

2
src/com/android/settings/network/telephony/MobileNetworkSettings.java
View File

@@ -214,6 +214,8 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings {
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
// TODO: remove log after fixing b/182326102
Log.d(LOG_TAG, "onResume() subId=" + mSubId);
if (mActiveSubsciptionsListener == null) { if (mActiveSubsciptionsListener == null) {
mActiveSubsciptionsListener = new ActiveSubsciptionsListener( mActiveSubsciptionsListener = new ActiveSubsciptionsListener(
getContext().getMainLooper(), getContext(), mSubId) { getContext().getMainLooper(), getContext(), mSubId) {