Merge "Monitor provision status change and handle it accordingly" into nyc-mr1-dev

2 files changed, 12 insertions, 2 deletions

diff --git a/rcs/presencepolling/src/com/android/service/ims/presence/CapabilityPolling.java b/rcs/presencepolling/src/com/android/service/ims/presence/CapabilityPolling.java
index 0502828..ab42858 100644
--- a/rcs/presencepolling/src/com/android/service/ims/presence/CapabilityPolling.java
+++ b/rcs/presencepolling/src/com/android/service/ims/presence/CapabilityPolling.java
@@ -116,6 +116,10 @@ public class CapabilityPolling {
                 if ((ImsConfig.ConfigConstants.CAPABILITIES_POLL_INTERVAL == item) ||
                     (ImsConfig.ConfigConstants.CAPABILITIES_CACHE_EXPIRATION == item)) {
                     enqueueSettingsChanged();
+                } else if ((ImsConfig.ConfigConstants.VLT_SETTING_ENABLED == item) ||
+                        (ImsConfig.ConfigConstants.LVC_SETTING_ENABLED == item) ||
+                        (ImsConfig.ConfigConstants.EAB_SETTING_ENABLED == item)) {
+                    enqueueProvisionStateChanged();
                 }
             } else if(TelephonyIntents.ACTION_SIM_STATE_CHANGED.equalsIgnoreCase(action)) {
                 String stateExtra = intent.getStringExtra(
@@ -286,7 +290,8 @@ public class CapabilityPolling {
                 }
             }
         }
-
+        logger.print("isPollingReady, mProvisioned: " + mProvisioned +
+                ", mStackAvailable: " + mStackAvailable + ", mPublished: " + mPublished);
         return mStackAvailable && (mPublished == 1) && (mProvisioned == 1);
     }
 
diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java b/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java
index 99a213f..f09bcea 100644
--- a/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java
+++ b/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java
@@ -268,7 +268,12 @@ public class PresencePublication extends PresenceBase {
                     }
                 } else if(ImsConfig.ACTION_IMS_FEATURE_CHANGED.equalsIgnoreCase(
                         intent.getAction())){
-                    handleProvisionChanged();
+                    int item = intent.getIntExtra(ImsConfig.EXTRA_CHANGED_ITEM, -1);
+                    if ((ImsConfig.ConfigConstants.VLT_SETTING_ENABLED == item) ||
+                            (ImsConfig.ConfigConstants.LVC_SETTING_ENABLED == item) ||
+                            (ImsConfig.ConfigConstants.EAB_SETTING_ENABLED == item)) {
+                        handleProvisionChanged();
+                    }
                 }
             }
         };