diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-30 20:26:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-06-30 20:26:05 +0000 |
| commit | 3549d36e4cf763e4741cf3fae5f46bcaf08637f9 (patch) | |
| tree | 83b2bbfeef47633dce971d0033a150a7c19d4a67 /src/com/android | |
| parent | b9443f44862c09a9cabcef8b34171e57737d36b9 (diff) | |
| parent | 652411e898cf4c2a8158f001a699e2f22253ec03 (diff) | |
| download | platform_packages_services_Telephony-3549d36e4cf763e4741cf3fae5f46bcaf08637f9.tar.gz platform_packages_services_Telephony-3549d36e4cf763e4741cf3fae5f46bcaf08637f9.tar.bz2 platform_packages_services_Telephony-3549d36e4cf763e4741cf3fae5f46bcaf08637f9.zip | |
Merge "Do not check single reg permission for destroying SipDelegate" into sc-dev
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/phone/ImsRcsController.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/phone/ImsRcsController.java b/src/com/android/phone/ImsRcsController.java index 1a495def8..7d594d12f 100644 --- a/src/com/android/phone/ImsRcsController.java +++ b/src/com/android/phone/ImsRcsController.java @@ -601,8 +601,11 @@ public class ImsRcsController extends IImsRcsController.Stub { @Override public void destroySipDelegate(int subId, ISipDelegate connection, int reason) { - enforceImsSingleRegistrationPermission("destroySipDelegate"); - + // Do not check permissions here - the caller needs to have a connection already from the + // create method to call this method. + if (connection == null) { + return; + } final long identity = Binder.clearCallingIdentity(); try { SipTransportController transport = getRcsFeatureController(subId).getFeature( |