Merge "Check for compatibilty with call subject and video call features." into... (aff6939a) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/common/CallUtil.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.contacts.common;

		import com.android.contacts.common.compat.CompatUtils;
		import com.android.contacts.common.util.PermissionsUtil;
		import com.android.contacts.common.util.PhoneNumberHelper;
		import com.android.phone.common.PhoneConstants;
		@@ -109,7 +110,8 @@ public class CallUtil {
		* {@code false} otherwise.
		*/
		public static boolean isVideoEnabled(Context context) {
		if (!PermissionsUtil.hasPermission(context, android.Manifest.permission.READ_PHONE_STATE)) {
		if (!PermissionsUtil.hasPermission(context, android.Manifest.permission.READ_PHONE_STATE)
		\|\| !CompatUtils.isVideoCompatible()) {
		return false;
		}
		TelecomManager telecommMgr = (TelecomManager)
		@@ -137,7 +139,8 @@ public class CallUtil {
		* subject specified, {@code false} otherwise.
		*/
		public static boolean isCallWithSubjectSupported(Context context) {
		if (!PermissionsUtil.hasPermission(context, android.Manifest.permission.READ_PHONE_STATE)) {
		if (!PermissionsUtil.hasPermission(context, android.Manifest.permission.READ_PHONE_STATE)
		\|\| !CompatUtils.isCallSubjectCompatible()) {
		return false;
		}
		TelecomManager telecommMgr = (TelecomManager)

+22 −0

Original line number	Diff line number	Diff line
		@@ -61,4 +61,26 @@ public final class CompatUtils {
		return SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.LOLLIPOP)
		>= Build.VERSION_CODES.LOLLIPOP_MR1;
		}

		/**
		* Determines if this version is compatible with video calling. Can also force the version to be
		* lower through SdkVersionOverride.
		*
		* @return {@code true} if video calling is allowed, {@code false} otherwise.
		*/
		public static boolean isVideoCompatible() {
		return SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.LOLLIPOP)
		>= Build.VERSION_CODES.M;
		}

		/**
		* Determines if this version is compatible with call subject. Can also force the version to
		* be lower through SdkVersionOverride.
		*
		* @return {@code true} if call subject is a feature on this device, {@code false} otherwise.
		*/
		public static boolean isCallSubjectCompatible() {
		return SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.LOLLIPOP)
		>= Build.VERSION_CODES.M;
		}
		}