Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 724ca7f0 authored by emancebo's avatar emancebo Committed by Ed Mancebo
Browse files

Fix telephony property access for CDMA rewrite rules in PhoneNumberUtils 

Change-Id: I52140716b8ea3cf037fccfa301566eb1002c3dad
issue-id: RENDANG-221
(cherry picked from commit 8e9d7d47)
parent 46ef3540

telephony/java/android/telephony/PhoneNumberUtils.java

+2 −4
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ import android.text.style.TtsSpan; 
import android.util.SparseIntArray;



import static com.android.internal.telephony.PhoneConstants.SUBSCRIPTION_KEY;

import static com.android.internal.telephony.TelephonyProperties.PROPERTY_ICC_OPERATOR_ISO_COUNTRY;

import static com.android.internal.telephony.TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY;

import static com.android.internal.telephony.TelephonyProperties.PROPERTY_OPERATOR_IDP_STRING;



import java.util.Locale;
@@ -2598,8 +2596,8 @@ public class PhoneNumberUtils 
            } else {

                RewriteRule rewriteRule =

                        getCdmaLocalRewriteRule(networkDialStr,

                                SystemProperties.get(PROPERTY_OPERATOR_ISO_COUNTRY, ""),

                                SystemProperties.get(PROPERTY_ICC_OPERATOR_ISO_COUNTRY, ""));

                                TelephonyManager.getDefault().getNetworkCountryIso(),

                                TelephonyManager.getDefault().getSimCountryIso());

                if (rewriteRule != null) {

                    retStr = rewriteRule.apply(networkDialStr);

                } else {