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

Commit ec3f46a5 authored by Pavel Zhamaitsiak's avatar Pavel Zhamaitsiak Committed by Android (Google) Code Review
Browse files

Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev

parents 0bb83b07 827fcb7f

telephony/java/com/android/ims/ImsReasonInfo.java

+7 −0
Original line number Diff line number Diff line
@@ -228,6 +228,13 @@ public class ImsReasonInfo implements Parcelable { 
     */

    public static final int CODE_ECBM_NOT_SUPPORTED = 901;



    /**

     * Network string error messages.

     * mExtraMessage may have these values.

     */

    public static final String EXTRA_MSG_SERVICE_NOT_AUTHORIZED

            = "Forbidden. Not Authorized for Service";



    // For reason type

    public int mReasonType;

    // For main reason code

telephony/java/com/android/internal/telephony/TelephonyIntents.java

+9 −0
Original line number Diff line number Diff line
@@ -273,6 +273,15 @@ public class TelephonyIntents { 
     */

    public static final String ACTION_CARRIER_SETUP = "android.intent.action.ACTION_CARRIER_SETUP";



    /**

     * <p>Broadcast Action: Indicates that the action is forbidden by network.

     * <p class="note">

     * This is for the OEM applications to understand about possible provisioning issues.

     * Used in OMA-DM applications.

     */

    public static final String ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION

            = "android.intent.action.ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION";



    /**

     * Broadcast Action: A "secret code" has been entered in the dialer. Secret codes are

     * of the form {@code *#*#<code>#*#*}. The intent will have the data URI: