commit c229f0f01416e7eddb2da256f032ec05539bae35
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 12 00:08:02 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 12 00:08:02 2017 +0000
tree 80b0fa0fca7d305eab5a5dfdee3f04c1f533f76f
parent d783bc739ec429beb07eecb9c6f2b2d3f0f9b497
parent 00b4ab5b42f687bad66026805e1c0b18a0c14b6e

Merge "Set/read VM vibration and ringtone from default phone if SIM is absent" into oc-dev

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 3638877..a3b6195 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -3429,9 +3429,9 @@
      */
     @Override
     public Uri getVoicemailRingtoneUri(PhoneAccountHandle accountHandle) {
-        final Phone phone = PhoneUtils.getPhoneForPhoneAccountHandle(accountHandle);
+        Phone phone = PhoneUtils.getPhoneForPhoneAccountHandle(accountHandle);
         if (phone == null) {
-            return null;
+            phone = mPhone;
         }
 
         return VoicemailNotificationSettingsUtil.getRingtoneUri(phone);
@@ -3459,8 +3459,7 @@
         }
         Phone phone = PhoneUtils.getPhoneForPhoneAccountHandle(phoneAccountHandle);
         if (phone == null){
-            throw new IllegalArgumentException("The phoneAccountHandle does not correspond to an "
-                    + "active phone account.");
+           phone = mPhone;
         }
         VoicemailNotificationSettingsUtil.setRingtoneUri(phone, uri);
     }
@@ -3474,9 +3473,9 @@
      */
     @Override
     public boolean isVoicemailVibrationEnabled(PhoneAccountHandle accountHandle) {
-        final Phone phone = PhoneUtils.getPhoneForPhoneAccountHandle(accountHandle);
+        Phone phone = PhoneUtils.getPhoneForPhoneAccountHandle(accountHandle);
         if (phone == null) {
-            return false;
+            phone = mPhone;
         }
 
         return VoicemailNotificationSettingsUtil.isVibrationEnabled(phone);
@@ -3505,8 +3504,7 @@
 
         Phone phone = PhoneUtils.getPhoneForPhoneAccountHandle(phoneAccountHandle);
         if (phone == null){
-            throw new IllegalArgumentException("The phoneAccountHandle does not correspond to an "
-                    + "active phone account.");
+            phone = mPhone;
         }
         VoicemailNotificationSettingsUtil.setVibrationEnabled(phone, enabled);
     }