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

Commit affac042 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed the phone number issue" into main

parents ac903221 e0e76f39

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+3 −5
Original line number Diff line number Diff line
@@ -3919,12 +3919,10 @@ public class SubscriptionManagerService extends ISub.Stub { 
            case SubscriptionManager.PHONE_NUMBER_SOURCE_UICC:

                final Phone phone = PhoneFactory.getPhone(getSlotIndex(subId));

                if (phone != null) {

                    String number = phone.getLine1Number();

                    if (!TextUtils.isEmpty(number)) {

                        return number;

                    }

                }

                    return TextUtils.emptyIfNull(phone.getLine1Number());

                } else {

                    return subInfo.getNumber();

                }

            case SubscriptionManager.PHONE_NUMBER_SOURCE_CARRIER:

                return subInfo.getNumberFromCarrier();

            case SubscriptionManager.PHONE_NUMBER_SOURCE_IMS:

tests/telephonytests/src/com/android/internal/telephony/subscription/SubscriptionManagerServiceTest.java

+1 −2
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ import android.testing.AndroidTestingRunner; 
import android.testing.TestableLooper;

import android.util.ArraySet;

import android.util.Base64;

import android.util.Log;



import com.android.internal.R;

import com.android.internal.telephony.ContextFixture;
@@ -2579,7 +2578,7 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 
        // If getLine1Number is empty, then the number should be from the sub info.

        assertThat(mSubscriptionManagerServiceUT.getPhoneNumber(1,

                SubscriptionManager.PHONE_NUMBER_SOURCE_UICC, CALLING_PACKAGE, CALLING_FEATURE))

                .isEqualTo(FAKE_PHONE_NUMBER2);

                .isEqualTo("");

    }



    @Test