mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-23 22:49:28 -05:00
202033c013
This adds 3 expat patches for n-asb-2022-09 from https://github.com/syphyr/android_external_expat/commits/cm-14.1 and also applies 2 of them to 15.1 Signed-off-by: Tad <tad@spotco.us>
37 lines
1.7 KiB
Diff
37 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Stuart <tjstuart@google.com>
|
|
Date: Mon, 31 Jan 2022 20:31:42 +0000
|
|
Subject: [PATCH] limit TelecomManager#registerPhoneAccount to 10; api doc
|
|
update
|
|
|
|
bug: 209814693
|
|
Bug: 217934478
|
|
Test: CTS
|
|
Change-Id: I8e4425a4e7de716f86b1f1f56ea605d93f357a57
|
|
Merged-In: I8e4425a4e7de716f86b1f1f56ea605d93f357a57
|
|
(cherry picked from commit f0f67b5a319efedbf8693b436a641fa65bc2d8be)
|
|
Merged-In: I8e4425a4e7de716f86b1f1f56ea605d93f357a57
|
|
---
|
|
telecomm/java/android/telecom/TelecomManager.java | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
|
|
index c06fb3aeb860..b05e0fc2752c 100644
|
|
--- a/telecomm/java/android/telecom/TelecomManager.java
|
|
+++ b/telecomm/java/android/telecom/TelecomManager.java
|
|
@@ -845,9 +845,14 @@ public class TelecomManager {
|
|
* when placing calls. The user may still need to enable the {@link PhoneAccount} within
|
|
* the phone app settings before the account is usable.
|
|
* <p>
|
|
+ * Note: Each package is limited to 10 {@link PhoneAccount} registrations.
|
|
+ * <p>
|
|
* A {@link SecurityException} will be thrown if an app tries to register a
|
|
* {@link PhoneAccountHandle} where the package name specified within
|
|
* {@link PhoneAccountHandle#getComponentName()} does not match the package name of the app.
|
|
+ * <p>
|
|
+ * A {@link IllegalArgumentException} will be thrown if an app tries to register a
|
|
+ * {@link PhoneAccount} when the upper bound limit, 10, has already been reached.
|
|
*
|
|
* @param account The complete {@link PhoneAccount}.
|
|
*/
|