Update flags to be consistent with GTalk's (b332747e) · Commits · e / os / android_frameworks_base

api/current.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -147429,7 +147429,7 @@
		type="int"
		transient="false"
		volatile="false"
		value="2"
		value="1"
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -147447,11 +147447,11 @@
		visibility="public"
		>
		</field>
		<field name="CAPABILITY_HAS_VIDEO_PLAYBACK_ONLY"
		<field name="CAPABILITY_HAS_VIDEO"
		type="int"
		transient="false"
		volatile="false"
		value="1"
		value="2"
		static="true"
		final="true"
		deprecated="not deprecated"

core/java/android/provider/ContactsContract.java

+10 −8

Original line number	Diff line number	Diff line
		@@ -2461,18 +2461,19 @@ public final class ContactsContract {
		public static final String CHAT_CAPABILITY = "chat_capability";

		/**
		* An allowed value of {@link #CHAT_CAPABILITY}. Indicates that the contact's device can
		* display a video feed.
		* An allowed flag of {@link #CHAT_CAPABILITY}. Indicates audio-chat capability (microphone
		* and speaker)
		*/
		public static final int CAPABILITY_HAS_VIDEO_PLAYBACK_ONLY = 1;
		public static final int CAPABILITY_HAS_VOICE = 1;

		/**
		* An allowed value of {@link #CHAT_CAPABILITY}. Indicates audio-chat capability.
		* An allowed flag of {@link #CHAT_CAPABILITY}. Indicates that the contact's device can
		* display a video feed.
		*/
		public static final int CAPABILITY_HAS_VOICE = 2;
		public static final int CAPABILITY_HAS_VIDEO = 2;

		/**
		* An allowed value of {@link #CHAT_CAPABILITY}. Indicates that the contact's device has a
		* An allowed flag of {@link #CHAT_CAPABILITY}. Indicates that the contact's device has a
		* camera that can be used for video chat (e.g. a front-facing camera on a phone).
		*/
		public static final int CAPABILITY_HAS_CAMERA = 4;
		@@ -3632,10 +3633,11 @@ public final class ContactsContract {
		* <td>int</td>
		* <td>{@link #CHAT_CAPABILITY}</td>
		* <td>read/write</td>
		* <td>Contact IM chat compatibility value. The allowed values are:
		* <td>Contact IM chat compatibility value. The allowed values combinations of the following
		* flags. If None of these flags is set, the device can only do text messaging.
		* <p>
		* <ul>
		* <li>{@link #CAPABILITY_HAS_VIDEO_PLAYBACK_ONLY}</li>
		* <li>{@link #CAPABILITY_HAS_VIDEO}</li>
		* <li>{@link #CAPABILITY_HAS_VOICE}</li>
		* <li>{@link #CAPABILITY_HAS_CAMERA}</li>
		* </ul>