Revert "resolve merge conflicts of c1e2c65 to m-wireless-dev." (b1897e09) · Commits · e / os / android_frameworks_opt_telephony

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

+0 −11

Original line number	Diff line number	Diff line
		@@ -1993,15 +1993,4 @@ public interface Phone {
		* emergency operator.
		*/
		public boolean isInEcm();

		* Returns the Status of Wi-Fi Calling
		*@hide
		*/
		public boolean isWifiCallingEnabled();

		/**
		* Returns the Status of Volte
		*@hide
		*/
		public boolean isVolteEnabled();
		}

+0 −28

Original line number	Diff line number	Diff line
		@@ -2086,34 +2086,6 @@ public abstract class PhoneBase extends Handler implements Phone {
		return isImsRegistered;
		}

		/**
		* Get Wifi Calling Feature Availability
		*/
		@Override
		public boolean isWifiCallingEnabled() {
		ImsPhone imsPhone = mImsPhone;
		boolean isWifiCallingEnabled = false;
		if (imsPhone != null) {
		isWifiCallingEnabled = imsPhone.isVowifiEnabled();
		}
		Rlog.d(LOG_TAG, "isWifiCallingEnabled =" + isWifiCallingEnabled);
		return isWifiCallingEnabled;
		}

		/**
		* Get Volte Feature Availability
		*/
		@Override
		public boolean isVolteEnabled() {
		ImsPhone imsPhone = mImsPhone;
		boolean isVolteEnabled = false;
		if (imsPhone != null) {
		isVolteEnabled = imsPhone.isVolteEnabled();
		}
		Rlog.d(LOG_TAG, "isImsRegistered =" + isVolteEnabled);
		return isVolteEnabled;
		}

		private boolean getRoamingOverrideHelper(String prefix, String key) {
		String iccId = getIccSerialNumber();
		if (TextUtils.isEmpty(iccId) \|\| TextUtils.isEmpty(key)) {

+0 −7

Original line number	Diff line number	Diff line
		@@ -1530,13 +1530,6 @@ public class PhoneProxy extends Handler implements Phone {
		@Override
		public boolean isInEcm() {
		return mActivePhone.isInEcm();

		public boolean isVolteEnabled() {
		return mActivePhone.isVolteEnabled();
		}

		public boolean isWifiCallingEnabled() {
		return mActivePhone.isWifiCallingEnabled();
		}

		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {