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

Commit 3bfaeb7c authored by Ta-wei Yen's avatar Ta-wei Yen Committed by android-build-merger
Browse files

Merge \\"Add more configuration state for visual voicemail\\" into nyc-mr1-dev am: fbb87a05 

am: 6b4c1e2d

Change-Id: Ic927f2b9a0ef6e55614bd6ea7b62793a6d10bf36
parents b2adcb97 6b4c1e2d

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -33075,6 +33075,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_NEW_VOICEMAIL = "android.intent.action.NEW_VOICEMAIL";

    field public static final java.lang.String ACTION_SYNC_VOICEMAIL = "android.provider.action.SYNC_VOICEMAIL";

    field public static final java.lang.String AUTHORITY = "com.android.voicemail";

    field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.provider.extra.PHONE_ACCOUNT_HANDLE";

    field public static final java.lang.String EXTRA_SELF_CHANGE = "com.android.voicemail.extra.SELF_CHANGE";

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

  }
@@ -33083,6 +33084,9 @@ package android.provider { 
    method public static android.net.Uri buildSourceUri(java.lang.String);

    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_CONFIGURING = 3; // 0x3

    field public static final int CONFIGURATION_STATE_DISABLED = 5; // 0x5

    field public static final int CONFIGURATION_STATE_FAILED = 4; // 0x4

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

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

    field public static final android.net.Uri CONTENT_URI;

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -35783,6 +35783,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_NEW_VOICEMAIL = "android.intent.action.NEW_VOICEMAIL";

    field public static final java.lang.String ACTION_SYNC_VOICEMAIL = "android.provider.action.SYNC_VOICEMAIL";

    field public static final java.lang.String AUTHORITY = "com.android.voicemail";

    field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.provider.extra.PHONE_ACCOUNT_HANDLE";

    field public static final java.lang.String EXTRA_SELF_CHANGE = "com.android.voicemail.extra.SELF_CHANGE";

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

  }
@@ -35791,6 +35792,9 @@ package android.provider { 
    method public static android.net.Uri buildSourceUri(java.lang.String);

    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_CONFIGURING = 3; // 0x3

    field public static final int CONFIGURATION_STATE_DISABLED = 5; // 0x5

    field public static final int CONFIGURATION_STATE_FAILED = 4; // 0x4

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

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

    field public static final android.net.Uri CONTENT_URI;

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -33152,6 +33152,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_NEW_VOICEMAIL = "android.intent.action.NEW_VOICEMAIL";

    field public static final java.lang.String ACTION_SYNC_VOICEMAIL = "android.provider.action.SYNC_VOICEMAIL";

    field public static final java.lang.String AUTHORITY = "com.android.voicemail";

    field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.provider.extra.PHONE_ACCOUNT_HANDLE";

    field public static final java.lang.String EXTRA_SELF_CHANGE = "com.android.voicemail.extra.SELF_CHANGE";

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

  }
@@ -33160,6 +33161,9 @@ package android.provider { 
    method public static android.net.Uri buildSourceUri(java.lang.String);

    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_CONFIGURING = 3; // 0x3

    field public static final int CONFIGURATION_STATE_DISABLED = 5; // 0x5

    field public static final int CONFIGURATION_STATE_FAILED = 4; // 0x4

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

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

    field public static final android.net.Uri CONTENT_URI;

core/java/android/provider/VoicemailContract.java

+25 −0
Original line number Diff line number Diff line
@@ -152,6 +152,13 @@ public class VoicemailContract { 
     */

    public static final String EXTRA_SELF_CHANGE = "com.android.voicemail.extra.SELF_CHANGE";



    /**

     * Extra included in {@link #ACTION_SYNC_VOICEMAIL} broadcast intents to indicate which {@link

     * PhoneAccountHandle} to sync.

     */

    public static final String EXTRA_PHONE_ACCOUNT_HANDLE =

            "android.provider.extra.PHONE_ACCOUNT_HANDLE";



    /**

     * Name of the source package field, which must be same across all voicemail related tables.

     * This is an internal field.
@@ -454,6 +461,9 @@ public class VoicemailContract { 
         * {@link #CONFIGURATION_STATE_OK},

         * {@link #CONFIGURATION_STATE_NOT_CONFIGURED},

         * {@link #CONFIGURATION_STATE_CAN_BE_CONFIGURED}

         * {@link #CONFIGURATION_STATE_CONFIGURING}

         * {@link #CONFIGURATION_STATE_FAILED}

         * {@link #CONFIGURATION_STATE_DISABLED}

         * <P>Type: INTEGER</P>

         */

        public static final String CONFIGURATION_STATE = "configuration_state";
@@ -472,6 +482,21 @@ public class VoicemailContract { 
         * upgraded to visual voicemail and would like to show a set up invitation message.

         */

        public static final int CONFIGURATION_STATE_CAN_BE_CONFIGURED = 2;

        /**

         * Value of {@link #CONFIGURATION_STATE} to indicate that visual voicemail still is being

         * configured.

         */

        public static final int CONFIGURATION_STATE_CONFIGURING = 3;

        /**

         * Value of {@link #CONFIGURATION_STATE} to indicate that visual voicemail has failed to

         * be configured.

         */

        public static final int CONFIGURATION_STATE_FAILED = 4;

        /**

         * Value of {@link #CONFIGURATION_STATE} to indicate that visual voicemail is disabled by

         * the user.

         */

        public static final int CONFIGURATION_STATE_DISABLED = 5;

        /**

         * The data channel state of the voicemail source. This the channel through which the source

         * pulls voicemail data from a remote server.