Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master am: bb1dd00d0b
am: 514c49510d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723688 Change-Id: I53a3e0d9353f93f0ca42d6e34decfe77bce63c29
This commit is contained in:
@@ -77,9 +77,6 @@ public class Enhanced4gBasePreferenceController extends TelephonyTogglePreferenc
|
|||||||
mTelephonyCallback = new PhoneCallStateTelephonyCallback();
|
mTelephonyCallback = new PhoneCallStateTelephonyCallback();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mSubId == subId) {
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
mSubId = subId;
|
mSubId = subId;
|
||||||
final PersistableBundle carrierConfig = getCarrierConfigForSubId(subId);
|
final PersistableBundle carrierConfig = getCarrierConfigForSubId(subId);
|
||||||
if (carrierConfig == null) {
|
if (carrierConfig == null) {
|
||||||
@@ -136,7 +133,7 @@ public class Enhanced4gBasePreferenceController extends TelephonyTogglePreferenc
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onStart() {
|
public void onStart() {
|
||||||
if (!isModeMatched() || (mTelephonyCallback == null)) {
|
if (mTelephonyCallback == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
mTelephonyCallback.register(mContext, mSubId);
|
mTelephonyCallback.register(mContext, mSubId);
|
||||||
|
Reference in New Issue
Block a user