aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-06-13 00:54:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-13 00:54:49 +0000
commit175c2a2aa55f6c2cb7c1eb9934ec12803e12c723 (patch)
treeed9b75624755003fabbb42b1d5a94442cd3aec08
parent1deb609cc509651ea36e89bf0a6c78fbf8ee403e (diff)
parent1a030c4a3b60fbfd413829f0e63c50ccb1e9ca4f (diff)
downloadims-175c2a2aa55f6c2cb7c1eb9934ec12803e12c723.tar.gz
Merge "Always record the latest PIDF + timestamp upon PUBLISH" into sc-dev am: 1a030c4a3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/14946960 Change-Id: I5ead1a198aaf3783c29319f1d80fe860e6e7fc7b
-rw-r--r--src/java/com/android/ims/rcs/uce/presence/publish/PublishControllerImpl.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/java/com/android/ims/rcs/uce/presence/publish/PublishControllerImpl.java b/src/java/com/android/ims/rcs/uce/presence/publish/PublishControllerImpl.java
index 165c4367..e2340ff5 100644
--- a/src/java/com/android/ims/rcs/uce/presence/publish/PublishControllerImpl.java
+++ b/src/java/com/android/ims/rcs/uce/presence/publish/PublishControllerImpl.java
@@ -903,10 +903,11 @@ public class PublishControllerImpl implements PublishController {
}
logd("publish state changes from " + mPublishState + " to " + newPublishState +
", time=" + updatedTimestamp);
- if (mPublishState == newPublishState) return;
- mPublishState = newPublishState;
mPublishStateUpdatedTime = updatedTimestamp;
mPidfXml = pidfXml;
+ // Bail early and do not update listeners if the publish state didn't change.
+ if (mPublishState == newPublishState) return;
+ mPublishState = newPublishState;
}
// Trigger the publish state changed in handler thread since it may take time.