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

Merge "API Review: Define the extras as containing CharSequences, not Strings" into rvc-dev am: 0542580955

Browse Source 
Change-Id: I1afc07ea0378fb89d9a0ae28b470bcbeb961d8db
This commit is contained in:
Automerger Merge Worker
2020-03-06 05:29:45 +00:00
parent 5d54a6968f 0542580955
commit f23515ae6e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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";