Merge "Add field QUOTA_OCCUPIED and QUOTA_TOTAL to VoicemailContract.Status" (76ef0fbe) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −0

api/system-current.txt

+6 −0

api/test-current.txt

+6 −0

core/java/android/provider/CallLog.java

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -420,6 +420,13 @@ public class CallLog {
	*/		*/
	public static final String ADD_FOR_ALL_USERS = "add_for_all_users";		public static final String ADD_FOR_ALL_USERS = "add_for_all_users";

			/**
			* The date the row is last inserted, updated, or marked as deleted, in milliseconds
			* since the epoch. Read only.
			* <P>Type: INTEGER (long)</P>
			*/
			public static final String LAST_MODIFIED = "last_modified";

	/**		/**
	* If a successful call is made that is longer than this duration, update the phone number		* If a successful call is made that is longer than this duration, update the phone number
	* in the ContactsProvider with the normalized version of the number, based on the user's		* in the ContactsProvider with the normalized version of the number, based on the user's

core/java/android/provider/VoicemailContract.java

+60 −0

Original line number	Original line	Diff line number	Diff line
	@@ -244,6 +244,13 @@ public class VoicemailContract {
	*/		*/
	public static final String DELETED = "deleted";		public static final String DELETED = "deleted";

			/**
			* The date the row is last inserted, updated, or marked as deleted, in milliseconds
			* since the epoch. Read only.
			* <P>Type: INTEGER (long)</P>
			*/
			public static final String LAST_MODIFIED = "last_modified";

	/**		/**
	* A convenience method to build voicemail URI specific to a source package by appending		* A convenience method to build voicemail URI specific to a source package by appending
	* {@link VoicemailContract#PARAM_KEY_SOURCE_PACKAGE} param to the base URI.		* {@link VoicemailContract#PARAM_KEY_SOURCE_PACKAGE} param to the base URI.
	@@ -448,6 +455,26 @@ public class VoicemailContract {
	*/		*/
	public static final int NOTIFICATION_CHANNEL_STATE_MESSAGE_WAITING = 2;		public static final int NOTIFICATION_CHANNEL_STATE_MESSAGE_WAITING = 2;

			/**
			* Amount of resource that is used by existing voicemail in the visual voicemail inbox,
			* or {@link #QUOTA_UNAVAILABLE}. Unit is not specified.
			* <P>Type: INTEGER</P>
			*/
			public static final String QUOTA_OCCUPIED = "quota_occupied";

			/**
			* Total resource in the visual voicemail inbox that can be used, or
			* {@link #QUOTA_UNAVAILABLE}. Unit is not specified.
			* <P>Type: INTEGER</P>
			*/
			public static final String QUOTA_TOTAL = "quota_total";

			/**
			* Value for {@link #QUOTA_OCCUPIED} and {@link #QUOTA_TOTAL} to indicate that no
			* information is available.
			*/
			public static final int QUOTA_UNAVAILABLE = -1;

	/**		/**
	* A convenience method to build status URI specific to a source package by appending		* A convenience method to build status URI specific to a source package by appending
	* {@link VoicemailContract#PARAM_KEY_SOURCE_PACKAGE} param to the base URI.		* {@link VoicemailContract#PARAM_KEY_SOURCE_PACKAGE} param to the base URI.
	@@ -487,6 +514,39 @@ public class VoicemailContract {
	}		}
	}		}

			/**
			* A helper method to set the quota of a voicemail source. Unit is unspecified.
			*
			* @param context The context from the package calling the method. This will be the source.
			* @param accountHandle The handle for the account the source is associated with.
			* @param occupied See {@link Status#QUOTA_OCCUPIED}
			* @param total See {@link Status#QUOTA_TOTAL}
			*/
			public static void setQuota(Context context, PhoneAccountHandle accountHandle, int occupied,
			int total) {
			if (occupied == QUOTA_UNAVAILABLE && total == QUOTA_UNAVAILABLE) {
			return;
			}
			ContentValues values = new ContentValues();
			values.put(Status.PHONE_ACCOUNT_COMPONENT_NAME,
			accountHandle.getComponentName().flattenToString());
			values.put(Status.PHONE_ACCOUNT_ID, accountHandle.getId());
			if (occupied != QUOTA_UNAVAILABLE) {
			values.put(Status.QUOTA_OCCUPIED,occupied);
			}
			if (total != QUOTA_UNAVAILABLE) {
			values.put(Status.QUOTA_TOTAL,total);
			}

			ContentResolver contentResolver = context.getContentResolver();
			Uri statusUri = buildSourceUri(context.getPackageName());
			if (isStatusPresent(contentResolver, statusUri)) {
			contentResolver.update(statusUri, values, null, null);
			} else {
			contentResolver.insert(statusUri, values);
			}
			}

	/**		/**
	* Determines if a voicemail source exists in the status table.		* Determines if a voicemail source exists in the status table.
	*		*