Merge "Add Carrier Presence to CP2: Phone" into m-wireless-dev (4920f261) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -24457,6 +24457,8 @@ package android.provider {
		}

		protected static abstract interface ContactsContract.DataColumns {
		field public static final java.lang.String CARRIER_PRESENCE = "carrier_presence";
		field public static final int CARRIER_PRESENCE_VT_CAPABLE = 1; // 0x1
		field public static final java.lang.String DATA1 = "data1";
		field public static final java.lang.String DATA10 = "data10";
		field public static final java.lang.String DATA11 = "data11";

+2 −0

Original line number	Diff line number	Diff line
		@@ -26151,6 +26151,8 @@ package android.provider {
		}

		protected static abstract interface ContactsContract.DataColumns {
		field public static final java.lang.String CARRIER_PRESENCE = "carrier_presence";
		field public static final int CARRIER_PRESENCE_VT_CAPABLE = 1; // 0x1
		field public static final java.lang.String DATA1 = "data1";
		field public static final java.lang.String DATA10 = "data10";
		field public static final java.lang.String DATA11 = "data11";

+15 −0

Original line number	Diff line number	Diff line
		@@ -4082,6 +4082,21 @@ public final class ContactsContract {
		public static final String SYNC3 = "data_sync3";
		/** Generic column for use by sync adapters. */
		public static final String SYNC4 = "data_sync4";

		/**
		* Carrier presence information.
		* <P>
		* Type: INTEGER (A bitmask of CARRIER_PRESENCE_* fields)
		* </P>
		*/
		public static final String CARRIER_PRESENCE = "carrier_presence";

		/**
		* Bitmask flags for CARRIER_PRESENCE column. Each value represents
		* a bit (or a set of bits) which may be set independently of each
		* other.
		*/
		public static final int CARRIER_PRESENCE_VT_CAPABLE = 0x01;
		}

		/**