commit 6d5a6a84c3b28a46379589fdda77896004def277
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Nov 15 19:29:44 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 15 19:29:44 2024 +0000
tree 8f59469dbe77ed0904858f613eb1459c71380ae8
parent f837d55f23531b7569d7c3acd802105b7440e912
parent b7e89e8c49ddd173bf2f6f0809c35bf65ba60f8e

Merge "Revert the security exception for voip phone account registration." into main

src/com/android/server/telecom/TelecomServiceImpl.java

diff --git a/src/com/android/server/telecom/TelecomServiceImpl.java b/src/com/android/server/telecom/TelecomServiceImpl.java
index 7ec2687..a662dde 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -892,8 +892,7 @@
                                             PhoneAccount.CAPABILITY_CONNECTION_MANAGER) ||
                                     account.hasCapabilities(
                                             PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
-                                throw new SecurityException("Self-managed ConnectionServices and "
-                                        + "transactional voip apps "
+                                throw new SecurityException("Self-managed ConnectionServices "
                                         + "cannot also be call capable, connection managers, or "
                                         + "SIM accounts.");
                             }