Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose intent broadcasted when IMS registration for WFC fails"

Browse Source
This commit is contained in:
Brad Ebinger
2020-01-22 18:19:54 +00:00
committed by Gerrit Code Review
parent 566f8f0195 be1c2969a8
commit d2ee60f378
3 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/system-current.txt
View File

@@ -9979,6 +9979,9 @@ package android.telephony.ims {
method @NonNull public android.telephony.ims.ImsMmTelManager getImsMmTelManager(int);
method @NonNull public android.telephony.ims.ImsRcsManager getImsRcsManager(int);
field public static final String ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION = "com.android.internal.intent.action.ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION";
field public static final String ACTION_WFC_IMS_REGISTRATION_ERROR = "android.telephony.ims.action.WFC_IMS_REGISTRATION_ERROR";
field public static final String EXTRA_WFC_REGISTRATION_FAILURE_MESSAGE = "android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_MESSAGE";
field public static final String EXTRA_WFC_REGISTRATION_FAILURE_TITLE = "android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_TITLE";
}
public class ImsMmTelManager implements android.telephony.ims.RegistrationManager {

3
api/test-current.txt
View File

@@ -3305,6 +3305,9 @@ package android.telephony.ims {
method @NonNull public android.telephony.ims.ImsMmTelManager getImsMmTelManager(int);
method @NonNull public android.telephony.ims.ImsRcsManager getImsRcsManager(int);
field public static final String ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION = "com.android.internal.intent.action.ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION";
field public static final String ACTION_WFC_IMS_REGISTRATION_ERROR = "android.telephony.ims.action.WFC_IMS_REGISTRATION_ERROR";
field public static final String EXTRA_WFC_REGISTRATION_FAILURE_MESSAGE = "android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_MESSAGE";
field public static final String EXTRA_WFC_REGISTRATION_FAILURE_TITLE = "android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_TITLE";
}
public class ImsMmTelManager implements android.telephony.ims.RegistrationManager {

37
telephony/java/android/telephony/ImsManager.java
View File

@@ -53,6 +53,43 @@ public class ImsManager {
public static final String ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION =
"com.android.internal.intent.action.ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION";
/**
* An intent action indicating that IMS registration for WiFi calling has resulted in an error.
* Contains error information that should be displayed to the user.
* <p>
* This intent will contain the following extra key/value pairs:
* {@link #EXTRA_WFC_REGISTRATION_FAILURE_TITLE}
* and {@link #EXTRA_WFC_REGISTRATION_FAILURE_MESSAGE}, which contain carrier specific
* error information that should be displayed to the user.
* <p>
* Usage: This intent is sent as an ordered broadcast. If the settings application is going
* to show the error information specified to the user, it should respond to
* {@link android.content.BroadcastReceiver#setResultCode(int)} with
* {@link android.app.Activity#RESULT_CANCELED}, which will signal to the framework that the
* event was handled. If the framework does not receive a response to the ordered broadcast,
* it will then show a notification to the user indicating that there was a registration
* failure.
*/
@SdkConstant(SdkConstant.SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String 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
* displayed as part of the message shown to the user when there is an error registering for
* WiFi calling.
*/
public static final String 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
* be displayed as part of the message shown to the user when there is an error registering for
* WiFi calling.
*/
public static final String EXTRA_WFC_REGISTRATION_FAILURE_MESSAGE =
"android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_MESSAGE";
/**
* Use {@link Context#getSystemService(String)} to get an instance of this class.
* @hide