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

Commit b18a0bf3 authored by Josh Hou's avatar Josh Hou Committed by Automerger Merge Worker
Browse files

Merge "Get the correct MDN from ImsPhone" into rvc-dev am: 62acac33 

Change-Id: I48243d4f6e6489b9d8de6962c0d2213cde474d24
parents dfd1ac6b 62acac33

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+5 −0
Original line number Diff line number Diff line
@@ -1470,6 +1470,11 @@ public class ImsPhone extends ImsPhoneBase { 
        return cfInfo;

    }



    @Override

    public String getLine1Number() {

        return mDefaultPhone.getLine1Number();

    }



    /**

     * Used to Convert ImsCallForwardInfo[] to CallForwardInfo[].

     * Update received call forward status to default IccRecords.

src/java/com/android/internal/telephony/imsphone/ImsPhoneBase.java

+0 −5
Original line number Diff line number Diff line
@@ -336,11 +336,6 @@ abstract class ImsPhoneBase extends Phone { 
        return null;

    }



    @Override

    public String getLine1Number() {

        return null;

    }



    @Override

    public String getLine1AlphaTag() {

        return null;