Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a07707a8 authored by Ta-wei Yen's avatar Ta-wei Yen
Browse files

Add field QUOTA_OCCUPIED and QUOTA_TOTAL to VoicemailContract.Status 

Fields to track how much visual voicemail quota is used.

Add field LAST_MODIFIED to VoicemailContract.Voicemails.
Add field LAST_MODIFIED to CallLog.Calls.

Timestamp field for the last time the row is inserted/updated.

+ VoicemailContract.Status.setQuota() helper method to set the quota.

Bug:25197644
Bug:22013880

Change-Id: Icb250203971df1f4ae4e1cbc9dbefeec9ad3282e
parent 5ad34c3e

api/current.txt

+6 −0
Original line number Diff line number Diff line
@@ -29312,6 +29312,7 @@ package android.provider { 
    field public static final java.lang.String GEOCODED_LOCATION = "geocoded_location";

    field public static final int INCOMING_TYPE = 1; // 0x1

    field public static final java.lang.String IS_READ = "is_read";

    field public static final java.lang.String LAST_MODIFIED = "last_modified";

    field public static final java.lang.String LIMIT_PARAM_KEY = "limit";

    field public static final int MISSED_TYPE = 3; // 0x3

    field public static final java.lang.String NEW = "new";
@@ -31581,6 +31582,7 @@ package android.provider { 














  public static final class VoicemailContract.Status implements android.provider.BaseColumns {















    method public static android.net.Uri buildSourceUri(java.lang.String);













    method public static void setQuota(android.content.Context, android.telecom.PhoneAccountHandle, int, int);















    field public static final java.lang.String CONFIGURATION_STATE = "configuration_state";















    field public static final int CONFIGURATION_STATE_CAN_BE_CONFIGURED = 2; // 0x2















    field public static final int CONFIGURATION_STATE_NOT_CONFIGURED = 1; // 0x1









@@ -31597,6 +31599,9 @@ package android.provider {













    field public static final int NOTIFICATION_CHANNEL_STATE_OK = 0; // 0x0















    field public static final java.lang.String PHONE_ACCOUNT_COMPONENT_NAME = "phone_account_component_name";















    field public static final java.lang.String PHONE_ACCOUNT_ID = "phone_account_id";













    field public static final java.lang.String QUOTA_OCCUPIED = "quota_occupied";













    field public static final java.lang.String QUOTA_TOTAL = "quota_total";













    field public static final int QUOTA_UNAVAILABLE = -1; // 0xffffffff















    field public static final java.lang.String SETTINGS_URI = "settings_uri";















    field public static final java.lang.String SOURCE_PACKAGE = "source_package";















    field public static final java.lang.String VOICEMAIL_ACCESS_URI = "voicemail_access_uri";









@@ -31613,6 +31618,7 @@ package android.provider {













    field public static final java.lang.String HAS_CONTENT = "has_content";















    field public static final java.lang.String IS_READ = "is_read";















    field public static final java.lang.String ITEM_TYPE = "vnd.android.cursor.item/voicemail";













    field public static final java.lang.String LAST_MODIFIED = "last_modified";















    field public static final java.lang.String MIME_TYPE = "mime_type";















    field public static final java.lang.String NUMBER = "number";















    field public static final java.lang.String PHONE_ACCOUNT_COMPONENT_NAME = "subscription_component_name";

























api/system-current.txt



+6
−0




























Original line number
Diff line number
Diff line








@@ -31306,6 +31306,7 @@ package android.provider {













    field public static final java.lang.String GEOCODED_LOCATION = "geocoded_location";















    field public static final int INCOMING_TYPE = 1; // 0x1















    field public static final java.lang.String IS_READ = "is_read";













    field public static final java.lang.String LAST_MODIFIED = "last_modified";















    field public static final java.lang.String LIMIT_PARAM_KEY = "limit";















    field public static final int MISSED_TYPE = 3; // 0x3















    field public static final java.lang.String NEW = "new";










@@ -33708,6 +33709,7 @@ package android.provider {



























  public static final class VoicemailContract.Status implements android.provider.BaseColumns {















    method public static android.net.Uri buildSourceUri(java.lang.String);













    method public static void setQuota(android.content.Context, android.telecom.PhoneAccountHandle, int, int);















    field public static final java.lang.String CONFIGURATION_STATE = "configuration_state";















    field public static final int CONFIGURATION_STATE_CAN_BE_CONFIGURED = 2; // 0x2















    field public static final int CONFIGURATION_STATE_NOT_CONFIGURED = 1; // 0x1









@@ -33724,6 +33726,9 @@ package android.provider {













    field public static final int NOTIFICATION_CHANNEL_STATE_OK = 0; // 0x0















    field public static final java.lang.String PHONE_ACCOUNT_COMPONENT_NAME = "phone_account_component_name";















    field public static final java.lang.String PHONE_ACCOUNT_ID = "phone_account_id";













    field public static final java.lang.String QUOTA_OCCUPIED = "quota_occupied";













    field public static final java.lang.String QUOTA_TOTAL = "quota_total";













    field public static final int QUOTA_UNAVAILABLE = -1; // 0xffffffff















    field public static final java.lang.String SETTINGS_URI = "settings_uri";















    field public static final java.lang.String SOURCE_PACKAGE = "source_package";















    field public static final java.lang.String VOICEMAIL_ACCESS_URI = "voicemail_access_uri";









@@ -33740,6 +33745,7 @@ package android.provider {













    field public static final java.lang.String HAS_CONTENT = "has_content";















    field public static final java.lang.String IS_READ = "is_read";















    field public static final java.lang.String ITEM_TYPE = "vnd.android.cursor.item/voicemail";













    field public static final java.lang.String LAST_MODIFIED = "last_modified";















    field public static final java.lang.String MIME_TYPE = "mime_type";















    field public static final java.lang.String NUMBER = "number";















    field public static final java.lang.String PHONE_ACCOUNT_COMPONENT_NAME = "subscription_component_name";

























api/test-current.txt



+6
−0




























Original line number
Diff line number
Diff line








@@ -29314,6 +29314,7 @@ package android.provider {













    field public static final java.lang.String GEOCODED_LOCATION = "geocoded_location";















    field public static final int INCOMING_TYPE = 1; // 0x1















    field public static final java.lang.String IS_READ = "is_read";













    field public static final java.lang.String LAST_MODIFIED = "last_modified";















    field public static final java.lang.String LIMIT_PARAM_KEY = "limit";















    field public static final int MISSED_TYPE = 3; // 0x3















    field public static final java.lang.String NEW = "new";










@@ -31583,6 +31584,7 @@ package android.provider {



























  public static final class VoicemailContract.Status implements android.provider.BaseColumns {















    method public static android.net.Uri buildSourceUri(java.lang.String);













    method public static void setQuota(android.content.Context, android.telecom.PhoneAccountHandle, int, int);















    field public static final java.lang.String CONFIGURATION_STATE = "configuration_state";















    field public static final int CONFIGURATION_STATE_CAN_BE_CONFIGURED = 2; // 0x2















    field public static final int CONFIGURATION_STATE_NOT_CONFIGURED = 1; // 0x1









@@ -31599,6 +31601,9 @@ package android.provider {













    field public static final int NOTIFICATION_CHANNEL_STATE_OK = 0; // 0x0















    field public static final java.lang.String PHONE_ACCOUNT_COMPONENT_NAME = "phone_account_component_name";















    field public static final java.lang.String PHONE_ACCOUNT_ID = "phone_account_id";













    field public static final java.lang.String QUOTA_OCCUPIED = "quota_occupied";













    field public static final java.lang.String QUOTA_TOTAL = "quota_total";













    field public static final int QUOTA_UNAVAILABLE = -1; // 0xffffffff















    field public static final java.lang.String SETTINGS_URI = "settings_uri";















    field public static final java.lang.String SOURCE_PACKAGE = "source_package";















    field public static final java.lang.String VOICEMAIL_ACCESS_URI = "voicemail_access_uri";









@@ -31615,6 +31620,7 @@ package android.provider {













    field public static final java.lang.String HAS_CONTENT = "has_content";















    field public static final java.lang.String IS_READ = "is_read";















    field public static final java.lang.String ITEM_TYPE = "vnd.android.cursor.item/voicemail";













    field public static final java.lang.String LAST_MODIFIED = "last_modified";















    field public static final java.lang.String MIME_TYPE = "mime_type";















    field public static final java.lang.String NUMBER = "number";















    field public static final java.lang.String PHONE_ACCOUNT_COMPONENT_NAME = "subscription_component_name";

























core/java/android/provider/CallLog.java



+7
−0




























Original line number
Diff line number
Diff line








@@ -420,6 +420,13 @@ public class CallLog {













         */















        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















         * 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
Diff line number
Diff line








@@ -244,6 +244,13 @@ public class VoicemailContract {













         */















        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















         * {@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;





























        /**













         * 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















         * {@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.















         *