commit 6366ce9e8044142f48ad8282c3e32278967223da
author Brad Ebinger <breadley@google.com> Thu Oct 01 13:51:05 2020 -0700
committer Brad Ebinger <breadley@google.com> Mon Oct 05 11:10:50 2020 -0700
tree 612583bd370bae10b9c92ba1f746ef91e71f8c56
parent e3ae65a5e4b46946679e020b0c2cda2afb56597c

Remove "oneshot" option from registering FeatureConnectors

Test: atest TeleServiceTests
Merged-In: Ia32ff769f0a6e78ef173811c6e2eb4aa81919a01
Change-Id: Ia32ff769f0a6e78ef173811c6e2eb4aa81919a01

src/com/android/phone/ImsRcsController.java

diff --git a/src/com/android/phone/ImsRcsController.java b/src/com/android/phone/ImsRcsController.java
index 1d33514..122386d 100644
--- a/src/com/android/phone/ImsRcsController.java
+++ b/src/com/android/phone/ImsRcsController.java
@@ -358,8 +358,7 @@
      * callback.
      */
     @Override
-    public void registerRcsFeatureCallback(int slotId, IImsServiceFeatureCallback callback,
-            boolean oneShot) {
+    public void registerRcsFeatureCallback(int slotId, IImsServiceFeatureCallback callback) {
         enforceModifyPermission();
 
         final long identity = Binder.clearCallingIdentity();
@@ -368,15 +367,12 @@
                 throw new ServiceSpecificException(ImsException.CODE_ERROR_UNSUPPORTED_OPERATION,
                         "Device does not support IMS");
             }
-            if (oneShot) {
-                mImsResolver.callBackIfExists(slotId, ImsFeature.FEATURE_RCS, callback);
-            } else {
-                mImsResolver.listenForFeature(slotId, ImsFeature.FEATURE_RCS, callback);
-            }
+            mImsResolver.listenForFeature(slotId, ImsFeature.FEATURE_RCS, callback);
         } finally {
             Binder.restoreCallingIdentity(identity);
         }
     }
+
     /**
      * Unregister a previously registered IImsServiceFeatureCallback associated with an ImsFeature.
      */