Merge "IMS: Map pay phone and unknown presentation with OIR." into mnc-dev (f7c5c373) · Commits · e / os / android_frameworks_base

telephony/java/com/android/ims/ImsCallProfile.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -143,6 +143,8 @@ public class ImsCallProfile implements Parcelable {
		public static final int OIR_DEFAULT = 0; // "user subscription default value"
		public static final int OIR_PRESENTATION_RESTRICTED = 1;
		public static final int OIR_PRESENTATION_NOT_RESTRICTED = 2;
		public static final int OIR_PRESENTATION_UNKNOWN = 3;
		public static final int OIR_PRESENTATION_PAYPHONE = 4;

		/**
		* Values for EXTRA_DIALSTRING
		@@ -373,6 +375,10 @@ public class ImsCallProfile implements Parcelable {
		return ImsCallProfile.OIR_PRESENTATION_RESTRICTED;
		case PhoneConstants.PRESENTATION_ALLOWED:
		return ImsCallProfile.OIR_PRESENTATION_NOT_RESTRICTED;
		case PhoneConstants.PRESENTATION_PAYPHONE:
		return ImsCallProfile.OIR_PRESENTATION_PAYPHONE;
		case PhoneConstants.PRESENTATION_UNKNOWN:
		return ImsCallProfile.OIR_PRESENTATION_UNKNOWN;
		default:
		return ImsCallProfile.OIR_DEFAULT;
		}
		@@ -389,6 +395,10 @@ public class ImsCallProfile implements Parcelable {
		return PhoneConstants.PRESENTATION_RESTRICTED;
		case ImsCallProfile.OIR_PRESENTATION_NOT_RESTRICTED:
		return PhoneConstants.PRESENTATION_ALLOWED;
		case ImsCallProfile.OIR_PRESENTATION_PAYPHONE:
		return PhoneConstants.PRESENTATION_PAYPHONE;
		case ImsCallProfile.OIR_PRESENTATION_UNKNOWN:
		return PhoneConstants.PRESENTATION_UNKNOWN;
		default:
		return PhoneConstants.PRESENTATION_UNKNOWN;
		}