diff options
author | Pavel Zhamaitsiak <pavelz@google.com> | 2014-12-16 19:37:15 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-16 19:37:15 +0000 |
commit | 4abd09f773a938fe006e4cc0839f0dc6023cb2f3 (patch) | |
tree | d05dd281b94d7ca839f9ad8f56c1f2045c16bf8f /telephony | |
parent | 2bd62b53b68834cabb48be608ee350012b1e8043 (diff) | |
parent | ab4f9976e0cade0009223681ecc5ff49df160dd7 (diff) | |
download | frameworks_base-4abd09f773a938fe006e4cc0839f0dc6023cb2f3.zip frameworks_base-4abd09f773a938fe006e4cc0839f0dc6023cb2f3.tar.gz frameworks_base-4abd09f773a938fe006e4cc0839f0dc6023cb2f3.tar.bz2 |
am ab4f9976: am ec3f46a5: Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev
* commit 'ab4f9976e0cade0009223681ecc5ff49df160dd7':
IMS OMA-DM Intent and ImsReasonInfo Additions
Diffstat (limited to 'telephony')
-rw-r--r-- | telephony/java/com/android/ims/ImsReasonInfo.java | 7 | ||||
-rw-r--r-- | telephony/java/com/android/internal/telephony/TelephonyIntents.java | 9 |
2 files changed, 16 insertions, 0 deletions
diff --git a/telephony/java/com/android/ims/ImsReasonInfo.java b/telephony/java/com/android/ims/ImsReasonInfo.java index 2482249..0b1246b 100644 --- a/telephony/java/com/android/ims/ImsReasonInfo.java +++ b/telephony/java/com/android/ims/ImsReasonInfo.java @@ -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 diff --git a/telephony/java/com/android/internal/telephony/TelephonyIntents.java b/telephony/java/com/android/internal/telephony/TelephonyIntents.java index c67e5d7..92cd468 100644 --- a/telephony/java/com/android/internal/telephony/TelephonyIntents.java +++ b/telephony/java/com/android/internal/telephony/TelephonyIntents.java @@ -274,6 +274,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: * |