commit 121f022dde0d0b292ce9d15efa64a354c0a0f18b
author Brad Ebinger <breadley@google.com> Wed Aug 11 13:41:44 2021 -0700
committer Brad Ebinger <breadley@google.com> Wed Aug 11 13:43:53 2021 -0700
tree 323bb1d4486c937e1b0508bf88ced97d6a740f3a
parent eac2c534b444df3ebc3a5f8940f4f9168d70a6ba

Set VT relies on presence cap issue for devices supporting new UCE stack

If the device supports VT presence using the
KEY_ENABLE_PRESENCE_CAPABILITY_EXCHANGE_BOOL carrier config, enable
the CAPABILITY_VIDEO_CALLING_RELIES_ON_PRESENCE capability and do
not require the user to have enabled contact discovery setting.

Bug: 196251472
Test: inspect PhoneAccount Caps and place VT call
Change-Id: I2b0e76e20dddab5fdec3218ec2794c69d5ff3767

src/com/android/services/telephony/TelecomAccountRegistry.java

diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index 7252f94..1d749f4 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -588,11 +588,15 @@
         private boolean isCarrierVideoPresenceSupported() {
             PersistableBundle b =
                     PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
-            boolean carrierConfigEnabled = b != null
-                    && (b.getBoolean(CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL)
-                    || b.getBoolean(
-                    CarrierConfigManager.Ims.KEY_ENABLE_PRESENCE_CAPABILITY_EXCHANGE_BOOL));
-            return carrierConfigEnabled && isUserContactDiscoverySettingEnabled();
+            if (b == null) return false;
+
+            // If using the new RcsUceAdapter API, this should be true if
+            // KEY_ENABLE_PRESENCE_CAPABILITY_EXCHANGE_BOOL is set. If using the old
+            // KEY_USE_RCS_PRESENCE_BOOL key, we have to also check the user setting.
+            return b.getBoolean(
+                    CarrierConfigManager.Ims.KEY_ENABLE_PRESENCE_CAPABILITY_EXCHANGE_BOOL)
+                    || (b.getBoolean(CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL)
+                    && isUserContactDiscoverySettingEnabled());
         }
 
         /**