Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42f33a05 authored by Junda Liu's avatar Junda Liu Committed by Android Git Automerger
Browse files

am 20baf033: Merge "Check line1number override and use it instead for... 

am 20baf033: Merge "Check line1number override and use it instead for subscription." into lmp-mr1-dev

* commit '20baf033':
  Check line1number override and use it instead for subscription.
parents 1e2ca359 20baf033

src/java/com/android/internal/telephony/SubscriptionController.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -280,6 +280,11 @@ public class SubscriptionController extends ISub.Stub { 
                + " mcc:" + mcc + " mnc:" + mnc + " countIso:" + countryIso);

                + " mcc:" + mcc + " mnc:" + mnc + " countIso:" + countryIso);

        }

        }





        String line1Number = mTelephonyManager.getLine1NumberForSubscriber(id);

        if (!TextUtils.isEmpty(line1Number) && !line1Number.equals(number)) {

            logd("Line1Number is different: " + line1Number);

            number = line1Number;

        }

        return new SubscriptionInfo(id, iccId, simSlotIndex, displayName, carrierName,

        return new SubscriptionInfo(id, iccId, simSlotIndex, displayName, carrierName,

                nameSource, iconTint, number, dataRoaming, iconBitmap, mcc, mnc, countryIso);

                nameSource, iconTint, number, dataRoaming, iconBitmap, mcc, mnc, countryIso);

    }

    }