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

Commit bc8d7d56 authored Jun 14, 2020 by Josh Hou Committed by Automerger Merge Worker Jun 14, 2020

Merge "Get the correct MDN from ImsPhone" am: 64e72304

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1324093

Change-Id: Id529a2180806fcd8c10ec898be98ffcb0cedd099

parents c10d6d69 64e72304

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -1583,6 +1583,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;