diff options
| author | Brad Ebinger <breadley@google.com> | 2022-02-19 02:27:12 +0000 |
|---|---|---|
| committer | Brad Ebinger <breadley@google.com> | 2022-02-22 21:40:08 +0000 |
| commit | f88c4378fa753df749ac04dc69ae7a1eb3e6f2dd (patch) | |
| tree | e42e5dfa76c0598f4574b74d71079c3f9ebc8f15 /src/java/com/android/ims | |
| parent | 0f9beedc9f3d0cf14cafd46ebb15b2e27226dee1 (diff) | |
| download | ims-f88c4378fa753df749ac04dc69ae7a1eb3e6f2dd.tar.gz | |
Revert "Set mPendingPublicCapabilities to the currently registered service description"
This reverts commit 0407bd9e1876d2290526fbd1c2cc762a646f20ad.
Reason for revert: CL caused NPE in certain scenarios - b/220236505
Change-Id: I0d9947ad996fe9838fa1307eb9f4271203754525
Diffstat (limited to 'src/java/com/android/ims')
| -rw-r--r-- | src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityInfo.java | 7 |
1 files changed, 1 insertions, 6 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 b7bdd9d6..8de8b01f 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 @@ -520,12 +520,7 @@ public class DeviceCapabilityInfo { @CapabilityMechanism int mechanism, Context context) { switch (mechanism) { case RcsContactUceCapability.CAPABILITY_MECHANISM_PRESENCE: - RcsContactUceCapability rcsContactUceCapability = getPresenceCapabilities(context); - if (rcsContactUceCapability != null) { - mPendingPublishCapabilities = - mServiceCapRegTracker.copyRegistrationCapabilities(); - } - return rcsContactUceCapability; + return getPresenceCapabilities(context); case RcsContactUceCapability.CAPABILITY_MECHANISM_OPTIONS: return getOptionsCapabilities(context); default: |