commit 7ed723db509e6fa86b96fa3d7fd6291ab142cb52
author fionaxu <fionaxu@google.com> Tue May 30 18:58:54 2017 -0700
committer fionaxu <fionaxu@google.com> Wed May 31 11:55:42 2017 -0700
tree 0eec3a977f1ac552af1318ed7ecb5ec0927d1972
parent b8aa08a1c1fcf000fe2803ee4614381dd961e7c4

migration user setting to VM notificationchannel

- move voicemailNotificationSettingsUtil from package/service/telephony
to framework/opt/telephony/util so that it can be referenced by
notificationChannelController

- voicemail notification user preference was based on subId but
notification channel don't differentiate subId. simply read the
default subId from preference and migrate if there is a match.

Bug: 62100344
Test: Manual test
Change-Id: If9f446e094216a54087c9af4f7634f1d096669c9

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 8afe14f..b5b4bb6 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -93,11 +93,10 @@
 import com.android.internal.telephony.uicc.UiccCard;
 import com.android.internal.telephony.uicc.UiccCardApplication;
 import com.android.internal.telephony.uicc.UiccController;
+import com.android.internal.telephony.util.VoicemailNotificationSettingsUtil;
 import com.android.internal.util.HexDump;
-import com.android.phone.settings.VoicemailNotificationSettingsUtil;
 import com.android.phone.vvm.PhoneAccountHandleConverter;
 import com.android.phone.vvm.RemoteVvmTaskManager;
-import com.android.phone.vvm.VisualVoicemailPreferences;
 import com.android.phone.vvm.VisualVoicemailSettingsUtil;
 import com.android.phone.vvm.VisualVoicemailSmsFilterConfig;
 
@@ -3437,7 +3436,7 @@
             phone = mPhone;
         }
 
-        return VoicemailNotificationSettingsUtil.getRingtoneUri(phone);
+        return VoicemailNotificationSettingsUtil.getRingtoneUri(phone.getContext());
     }
 
     /**
@@ -3464,7 +3463,7 @@
         if (phone == null){
            phone = mPhone;
         }
-        VoicemailNotificationSettingsUtil.setRingtoneUri(phone, uri);
+        VoicemailNotificationSettingsUtil.setRingtoneUri(phone.getContext(), uri);
     }
 
     /**
@@ -3481,7 +3480,7 @@
             phone = mPhone;
         }
 
-        return VoicemailNotificationSettingsUtil.isVibrationEnabled(phone);
+        return VoicemailNotificationSettingsUtil.isVibrationEnabled(phone.getContext());
     }
 
     /**
@@ -3509,7 +3508,7 @@
         if (phone == null){
             phone = mPhone;
         }
-        VoicemailNotificationSettingsUtil.setVibrationEnabled(phone, enabled);
+        VoicemailNotificationSettingsUtil.setVibrationEnabled(phone.getContext(), enabled);
     }
 
     /**