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

Merge "enforce stricter rules when registering phoneAccounts" into sc-qpr1-dev am: 6f0bdf90e2 am: 77e501084b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21318377

Change-Id: If4adcabd1fe285ac49dae0de283153daa72d6ed1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Thomas Stuart
2023-03-01 00:37:47 +00:00
committed by Automerger Merge Worker
parent b9aa94e390 77e501084b
commit a4c9a28c0e
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
telecomm/java/android/telecom/PhoneAccount.java
View File

@@ -555,6 +555,11 @@ public final class PhoneAccount implements Parcelable {
/**
* Sets the address. See {@link PhoneAccount#getAddress}.
* <p>
* Note: The entire URI value is limited to 256 characters. This check is
* enforced when registering the PhoneAccount via
* {@link TelecomManager#registerPhoneAccount(PhoneAccount)} and will cause an
* {@link IllegalArgumentException} to be thrown if URI is over 256.
*
* @param value The address of the phone account.
* @return The builder.
@@ -588,6 +593,10 @@ public final class PhoneAccount implements Parcelable {
/**
* Sets the icon. See {@link PhoneAccount#getIcon}.
* <p>
* Note: An {@link IllegalArgumentException} if the Icon cannot be written to memory.
* This check is enforced when registering the PhoneAccount via
* {@link TelecomManager#registerPhoneAccount(PhoneAccount)}
*
* @param icon The icon to set.
*/
@@ -621,6 +630,10 @@ public final class PhoneAccount implements Parcelable {
/**
* Specifies an additional URI scheme supported by the {@link PhoneAccount}.
*
* <p>
* Each URI scheme is limited to 256 characters. Adding a scheme over 256 characters will
* cause an {@link IllegalArgumentException} to be thrown when the account is registered.
*
* @param uriScheme The URI scheme.
* @return The builder.
*/
@@ -634,6 +647,12 @@ public final class PhoneAccount implements Parcelable {
/**
* Specifies the URI schemes supported by the {@link PhoneAccount}.
*
* <p>
* A max of 10 URI schemes can be added per account. Additionally, each URI scheme is
* limited to 256 characters. Adding more than 10 URI schemes or 256 characters on any
* scheme will cause an {@link IllegalArgumentException} to be thrown when the account
* is registered.
*
* @param uriSchemes The URI schemes.
* @return The builder.
*/