commit 5f5037c5039baa53b920e0185d040115c4449962
author James Lin <jamescflin@google.com> Tue Nov 03 02:22:29 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 03 02:22:29 2020 +0000
tree 0ce73ff2276b5ffd2737ffc4ee11d57710407530
parent a69bd1189e5a6446dd6057652d00fba4f6f4b4fb
parent 64e9121445d3403583358765bd993479581dafdd

Merge "[RCS UCE] Fix  build failed in Telephony because of the ImsService API changes"

src/com/android/phone/ImsRcsController.java

diff --git a/src/com/android/phone/ImsRcsController.java b/src/com/android/phone/ImsRcsController.java
index fd61936..461a097 100644
--- a/src/com/android/phone/ImsRcsController.java
+++ b/src/com/android/phone/ImsRcsController.java
@@ -309,6 +309,17 @@
     }
 
     @Override
+    public void requestNetworkAvailability(int subId, String callingPackage,
+            String callingFeatureId, Uri contactNumber, IRcsUceControllerCallback c) {
+        enforceReadPrivilegedPermission("requestNetworkAvailability");
+        if (!isUceSettingEnabled(subId, callingPackage, callingFeatureId)) {
+            throw new ServiceSpecificException(ImsException.CODE_ERROR_UNSUPPORTED_OPERATION,
+                    "The user has not enabled UCE for this subscription.");
+        }
+        // TODO: Implement this method
+    }
+
+    @Override
     public int getUcePublishState(int subId) {
         enforceReadPrivilegedPermission("getUcePublishState");
         final long token = Binder.clearCallingIdentity();

src/com/android/services/telephony/rcs/UserCapabilityExchangeImpl.java

diff --git a/src/com/android/services/telephony/rcs/UserCapabilityExchangeImpl.java b/src/com/android/services/telephony/rcs/UserCapabilityExchangeImpl.java
index ee0c5be..138d2d0 100644
--- a/src/com/android/services/telephony/rcs/UserCapabilityExchangeImpl.java
+++ b/src/com/android/services/telephony/rcs/UserCapabilityExchangeImpl.java
@@ -759,8 +759,6 @@
                 return RcsUceAdapter.ERROR_INSUFFICIENT_MEMORY;
             case ResultCode.SUBSCRIBE_LOST_NETWORK:
                 return RcsUceAdapter.ERROR_LOST_NETWORK;
-            case ResultCode.SUBSCRIBE_ALREADY_IN_QUEUE:
-                return RcsUceAdapter.ERROR_ALREADY_IN_QUEUE;
             default:
                 return RcsUceAdapter.ERROR_GENERIC_FAILURE;
         }