diff options
| author | joonhunshin <joonhunshin@google.com> | 2023-03-21 13:35:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-21 13:35:02 +0000 |
| commit | 9c4e137f42734672eccf05551019e5863e0e50ed (patch) | |
| tree | bd054d90fc26e0251d8201126716dd3fe002a443 | |
| parent | e1d888e5007812baad74b75ba01bb8d07289423c (diff) | |
| parent | d1e82624a5aa78cb60f2d91890a5b86e9a92cf49 (diff) | |
| download | ims-9c4e137f42734672eccf05551019e5863e0e50ed.tar.gz | |
Block PUBLISH execution when the MmTel registered to avoid multiple am: ec0d702927 am: d1e82624a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/22122392
Change-Id: I26a535dce84c532310ba6c274effd4d44268dc1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityListener.java | 4 | ||||
| -rw-r--r-- | tests/src/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityListenerTest.java | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityListener.java b/src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityListener.java index d3c82f2a..b58f7ec6 100644 --- a/src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityListener.java +++ b/src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityListener.java @@ -590,9 +590,9 @@ public class DeviceCapabilityListener { * This method is called when the MMTEL is registered. */ private void handleImsMmtelRegistered(int imsTransportType) { + // update capability, but not trigger PUBLISH message. + // PUBLISH message will be sent when the Capability status changed callback is called. mCapabilityInfo.updateImsMmtelRegistered(imsTransportType); - mHandler.sendTriggeringPublishMessage( - PublishController.PUBLISH_TRIGGER_MMTEL_REGISTERED); } /* diff --git a/tests/src/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityListenerTest.java b/tests/src/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityListenerTest.java index 7c649891..11350393 100644 --- a/tests/src/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityListenerTest.java +++ b/tests/src/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityListenerTest.java @@ -154,7 +154,8 @@ public class DeviceCapabilityListenerTest extends ImsTestBase { waitForHandlerActionDelayed(handler, HANDLER_WAIT_TIMEOUT_MS, HANDLER_SENT_DELAY_MS); verify(mDeviceCapability).updateImsMmtelRegistered(1); - verify(mCallback).requestPublishFromInternal( + // update capability, but not trigger PUBLISH message when MmTel registered. + verify(mCallback, never()).requestPublishFromInternal( PublishController.PUBLISH_TRIGGER_MMTEL_REGISTERED); } |