Snap for 9989322 from 5b8016f332c94718041c54ff43d60c0c4060f85b to mainline-rkpd-release
Change-Id: Ic2e5e7e87d39cf606ceba86b689832fdf26fe627
diff --git a/OWNERS b/OWNERS
index 95e48fc..fa4ba42 100644
--- a/OWNERS
+++ b/OWNERS
@@ -3,3 +3,5 @@
chinmayd@google.com
xiaotonj@google.com
tjstuart@google.com
+grantmenke@google.com
+pmadapurmath@google.com
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 d3c82f2..b58f7ec 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 @@
* 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 7c64989..1135039 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 @@
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);
}
