aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSungcheol Ahn <donaldahn@google.com>2023-02-24 03:52:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-24 03:52:20 +0000
commit92b3957a3aa39a9e7a683f1374cbfdd7571d29be (patch)
tree1c539b89ca8ba41ecbfd8662075c008d8d9b8e48
parente959641f7a4cdbec898fc50fc31f76085e17c0fa (diff)
parent5b4b443c48380d428871d4ed8f2b2974d9f3e7c8 (diff)
downloadims-92b3957a3aa39a9e7a683f1374cbfdd7571d29be.tar.gz
Fixed to update the Capability Info if any change in Rcs Feature Tags during Ims Mmtel alive. am: ac281856a6 am: 5b4b443c48
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2439793 Change-Id: I9b917038fe2a504bb4369c0f814513400786e2e3 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/DeviceCapabilityInfo.java3
-rw-r--r--tests/src/com/android/ims/rcs/uce/presence/publish/PublishServiceDescTrackerTest.java5
2 files changed, 8 insertions, 0 deletions
diff --git a/src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityInfo.java b/src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityInfo.java
index 56c317b9..c3636680 100644
--- a/src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityInfo.java
+++ b/src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityInfo.java
@@ -244,6 +244,9 @@ public class DeviceCapabilityInfo {
mRcsRegistered = false;
changed = true;
}
+
+ mLastRegistrationFeatureTags = Collections.emptySet();
+ updateRegistration(mLastRegistrationFeatureTags);
mRcsNetworkRegType = AccessNetworkConstants.TRANSPORT_TYPE_INVALID;
return changed;
}
diff --git a/tests/src/com/android/ims/rcs/uce/presence/publish/PublishServiceDescTrackerTest.java b/tests/src/com/android/ims/rcs/uce/presence/publish/PublishServiceDescTrackerTest.java
index ddd8932f..52017c7a 100644
--- a/tests/src/com/android/ims/rcs/uce/presence/publish/PublishServiceDescTrackerTest.java
+++ b/tests/src/com/android/ims/rcs/uce/presence/publish/PublishServiceDescTrackerTest.java
@@ -157,6 +157,11 @@ public class PublishServiceDescTrackerTest {
FeatureTags.FEATURE_TAG_LARGE_MODE);
t1.updateImsRegistration(imsReg);
assertEquals(expectedSet, t1.copyRegistrationCapabilities());
+
+ // delete the feature tags for Unregistered
+ expectedSet = new ArraySet<>();
+ t1.updateImsRegistration(Collections.emptySet());
+ assertEquals(expectedSet, t1.copyRegistrationCapabilities());
}
@SmallTest