Snap for 4759746 from 07807ff29ee08f0ad40312f656d5c3ac7ca22dec to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-cts-release

Change-Id: I86ce6237ea058830809da9593a0f3bf2b25cc5fb

1 files changed, 14 insertions, 19 deletions

diff --git a/rcs/rcsservice/src/com/android/service/ims/RcsService.java b/rcs/rcsservice/src/com/android/service/ims/RcsService.java
index 631ffbd..01f9fbd 100644
--- a/rcs/rcsservice/src/com/android/service/ims/RcsService.java
+++ b/rcs/rcsservice/src/com/android/service/ims/RcsService.java
@@ -28,12 +28,9 @@
 
 package com.android.service.ims;
 
-import android.net.Uri;
-
 import java.util.List;
 
 import android.content.Intent;
-import android.app.PendingIntent;
 import android.content.IntentFilter;
 import android.os.IBinder;
 import android.os.RemoteException;
@@ -45,11 +42,8 @@ import android.database.ContentObserver;
 import android.content.BroadcastReceiver;
 import android.provider.Settings;
 import android.net.ConnectivityManager;
-import com.android.ims.ImsConfig.FeatureValueConstants;
 import com.android.ims.ImsManager;
-import com.android.ims.ImsConfig;
 import com.android.ims.ImsConnectionStateListener;
-import com.android.ims.ImsServiceClass;
 import com.android.ims.ImsException;
 import android.telephony.SubscriptionManager;
 import android.telephony.ims.ImsReasonInfo;
@@ -58,12 +52,10 @@ import com.android.ims.RcsManager.ResultCode;
 import com.android.ims.internal.IRcsService;
 import com.android.ims.IRcsPresenceListener;
 import com.android.ims.internal.IRcsPresence;
-import com.android.ims.RcsPresence.PublishState;
 
 import com.android.ims.internal.Logger;
 import com.android.internal.telephony.IccCardConstants;
 import com.android.internal.telephony.TelephonyIntents;
-import com.android.service.ims.RcsStackAdaptor;
 
 import com.android.service.ims.presence.PresencePublication;
 import com.android.service.ims.presence.PresenceSubscriber;
@@ -112,10 +104,9 @@ public class RcsService extends Service{
                 Settings.Global.getUriFor(Settings.Global.MOBILE_DATA),
                 false, mObserver);
 
-        mVtSettingObserver = new VtSettingContentObserver();
+        mSiminfoSettingObserver = new SimInfoContentObserver();
         getContentResolver().registerContentObserver(
-                Settings.Global.getUriFor(Settings.Global.VT_IMS_ENABLED),
-                false, mVtSettingObserver);
+                SubscriptionManager.CONTENT_URI, false, mSiminfoSettingObserver);
 
         mReceiver = new BroadcastReceiver() {
             @Override
@@ -179,7 +170,7 @@ public class RcsService extends Service{
     @Override
     public void onDestroy() {
         getContentResolver().unregisterContentObserver(mObserver);
-        getContentResolver().unregisterContentObserver(mVtSettingObserver);
+        getContentResolver().unregisterContentObserver(mSiminfoSettingObserver);
         if (mReceiver != null) {
             unregisterReceiver(mReceiver);
             mReceiver = null;
@@ -318,21 +309,25 @@ public class RcsService extends Service{
     }
 
 
-    private VtSettingContentObserver mVtSettingObserver;
+    private SimInfoContentObserver mSiminfoSettingObserver;
 
     /**
-     * Receives notifications when Mobile data is enabled or disabled.
+     * Receives notifications when the TelephonyProvider is changed.
      */
-    private class VtSettingContentObserver extends ContentObserver {
-        public VtSettingContentObserver() {
+    private class SimInfoContentObserver extends ContentObserver {
+        public SimInfoContentObserver() {
             super(new Handler());
         }
 
         @Override
         public void onChange(final boolean selfChange) {
-            boolean enabled = Settings.Global.getInt(getContentResolver(),
-                    Settings.Global.VT_IMS_ENABLED, 1) == 1;
-            logger.debug("vt enabled status: " + (enabled ? "ON" : "OFF"));
+            ImsManager imsManager = ImsManager.getInstance(RcsService.this,
+                    SubscriptionManager.getDefaultVoicePhoneId());
+            if (imsManager == null) {
+                return;
+            }
+            boolean enabled = imsManager.isVtEnabledByUser();
+             logger.debug("vt enabled status: " + (enabled ? "ON" : "OFF"));
 
             onVtEnabled(enabled);
         }