commit d591d226996a9962238794e94d55049c76b1c11a
author Amit Mahajan <amitmahajan@google.com> Tue Apr 19 21:42:37 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 19 21:42:37 2016 +0000
tree faa6b1dbf05e21ff3319d5d5f14730632f772589
parent be482403b8d2a26ed01ca7c6c1f9883c8f945d4e
parent fc9fe6722792fef7afc32f07abebcf885ab65c7c

Change to use Phone instead of PhoneBase/PhoneProxy
am: fc9fe67

* commit 'fc9fe6722792fef7afc32f07abebcf885ab65c7c':
  Change to use Phone instead of PhoneBase/PhoneProxy

Change-Id: I53d82ded514d8611ab1d08122e66de933fe4012f

src/com/android/mms/service/SendRequest.java

diff --git a/src/com/android/mms/service/SendRequest.java b/src/com/android/mms/service/SendRequest.java
index 29e16fd..435e12c 100644
--- a/src/com/android/mms/service/SendRequest.java
+++ b/src/com/android/mms/service/SendRequest.java
@@ -35,9 +35,7 @@
 
 import com.android.internal.telephony.AsyncEmergencyContactNotifier;
 import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneBase;
 import com.android.internal.telephony.PhoneFactory;
-import com.android.internal.telephony.PhoneProxy;
 import com.android.internal.telephony.SmsApplication;
 import com.android.internal.telephony.SmsNumberUtils;
 import com.android.mms.service.exception.MmsHttpException;
@@ -279,13 +277,12 @@
             int nNumberCount = recipientNumbers.length;
             if (nNumberCount > 0) {
                 Phone phone = PhoneFactory.getDefaultPhone();
-                PhoneBase pb = (PhoneBase)((PhoneProxy)phone).getActivePhone();
                 EncodedStringValue[] newNumbers = new EncodedStringValue[nNumberCount];
                 String toNumber;
                 String newToNumber;
                 for (int i = 0; i < nNumberCount; i++) {
                     toNumber = recipientNumbers[i].getString();
-                    newToNumber = SmsNumberUtils.filterDestAddr(pb, toNumber);
+                    newToNumber = SmsNumberUtils.filterDestAddr(phone, toNumber);
                     if (!TextUtils.equals(toNumber, newToNumber)) {
                         isUpdated = true;
                         newNumbers[i] = new EncodedStringValue(newToNumber);