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

Commit 11d6cf56 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "API Review: Define the extras as containing CharSequences, not Strings"... 

Merge "API Review: Define the extras as containing CharSequences, not Strings" into rvc-dev am: 05425809 am: f23515ae am: 5f8464d4

Change-Id: I5eefb9867071efe2149e4a05b1b15953001bac1c
parents 9a421b56 5f8464d4

telephony/java/android/telephony/ImsManager.java

+6 −6
Original line number Original line Diff line number Diff line
@@ -74,17 +74,17 @@ public class ImsManager { 
            "android.telephony.ims.action.WFC_IMS_REGISTRATION_ERROR";

            "android.telephony.ims.action.WFC_IMS_REGISTRATION_ERROR";





    /**

    /**

     * An extra key corresponding to a String value which contains the carrier specific title to be

     * An extra key corresponding to a {@link CharSequence} value which contains the carrier

     * displayed as part of the message shown to the user when there is an error registering for

     * specific title to be displayed as part of the message shown to the user when there is an

     * WiFi calling.

     * error registering for WiFi calling.

     */

     */

    public static final String EXTRA_WFC_REGISTRATION_FAILURE_TITLE =

    public static final String EXTRA_WFC_REGISTRATION_FAILURE_TITLE =

            "android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_TITLE";

            "android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_TITLE";





    /**

    /**

     * An extra key corresponding to a String value which contains the carrier specific message to

     * An extra key corresponding to a {@link CharSequence} value which contains the carrier

     * be displayed as part of the message shown to the user when there is an error registering for

     * specific message to  be displayed as part of the message shown to the user when there is an

     * WiFi calling.

     * error registering for WiFi calling.

     */

     */

    public static final String EXTRA_WFC_REGISTRATION_FAILURE_MESSAGE =

    public static final String EXTRA_WFC_REGISTRATION_FAILURE_MESSAGE =

            "android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_MESSAGE";

            "android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_MESSAGE";