commit 0da9a7bd55e6d47ed0eed22b980eb82b7cb303ed
author Jonggeon Kim <jgkim@google.com> Thu Dec 23 08:56:50 2021 +0000
committer Jonggeon Kim <jgkim@google.com> Mon Jan 24 12:44:00 2022 +0000
tree 1180e90a08248bdbebae315e86058d8a0add8871
parent 761840d5ffec48a5b2c8f016f442b6658921d850

ImsService Subscription Notifications

The subId need to be propogated all the way to FeatureConnector.Listener#connectionReady so that classes can listen to changes in subId directly.

Bug: 197991451
Test: atest TeleServiceTests:ImsStateCallbackControllerTest, atest TeleServiceTests:RcsProvisioningMonitorTest, atest TeleServiceTests:RcsFeatureControllerTest

Change-Id: I4d9ae7c71f8b06e2d49fbdcb94d2575cc5b786f9
Merged-In: I4d9ae7c71f8b06e2d49fbdcb94d2575cc5b786f9

src/com/android/phone/ImsStateCallbackController.java

diff --git a/src/com/android/phone/ImsStateCallbackController.java b/src/com/android/phone/ImsStateCallbackController.java
index 28fca59..4e2407c 100644
--- a/src/com/android/phone/ImsStateCallbackController.java
+++ b/src/com/android/phone/ImsStateCallbackController.java
@@ -292,7 +292,7 @@
         }
 
         @Override
-        public void connectionReady(ImsManager manager) {
+        public void connectionReady(ImsManager manager, int subId) {
             logd(mLogPrefix + "connectionReady");
 
             mState = STATE_READY;
@@ -434,7 +434,7 @@
         }
 
         @Override
-        public void connectionReady(RcsFeatureManager manager) {
+        public void connectionReady(RcsFeatureManager manager, int subId) {
             logd(mLogPrefix + "connectionReady");
 
             mState = STATE_READY;

src/com/android/phone/RcsProvisioningMonitor.java

diff --git a/src/com/android/phone/RcsProvisioningMonitor.java b/src/com/android/phone/RcsProvisioningMonitor.java
index 6d2bd6f..baf0ac5 100644
--- a/src/com/android/phone/RcsProvisioningMonitor.java
+++ b/src/com/android/phone/RcsProvisioningMonitor.java
@@ -440,7 +440,7 @@
         }
 
         @Override
-        public void connectionReady(RcsFeatureManager manager) {
+        public void connectionReady(RcsFeatureManager manager, int subId) {
             mRcsFeatureManager = manager;
             mRcsProvisioningInfos.forEach(v -> v.onRcsStatusChanged(manager.getConfig()));
         }

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

diff --git a/src/com/android/services/telephony/rcs/RcsFeatureController.java b/src/com/android/services/telephony/rcs/RcsFeatureController.java
index cc1a2cc..0e1cb4b 100644
--- a/src/com/android/services/telephony/rcs/RcsFeatureController.java
+++ b/src/com/android/services/telephony/rcs/RcsFeatureController.java
@@ -128,7 +128,7 @@
     private FeatureConnector.Listener<RcsFeatureManager> mFeatureConnectorListener =
             new FeatureConnector.Listener<RcsFeatureManager>() {
                 @Override
-                public void connectionReady(RcsFeatureManager manager)
+                public void connectionReady(RcsFeatureManager manager, int subId)
                         throws com.android.ims.ImsException {
                     if (manager == null) {
                         logw("connectionReady returned null RcsFeatureManager");