diff options
Diffstat (limited to 'telephony/java')
4 files changed, 10 insertions, 10 deletions
diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index 962a600360b8..3c302513c04d 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -20,7 +20,7 @@ import com.android.i18n.phonenumbers.NumberParseException; import com.android.i18n.phonenumbers.PhoneNumberUtil; import com.android.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat; import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber; -import com.android.i18n.phonenumbers.ShortNumberUtil; +import com.android.i18n.phonenumbers.ShortNumberInfo; import android.content.Context; import android.content.Intent; @@ -1916,11 +1916,11 @@ public class PhoneNumberUtils // No ecclist system property, so use our own list. if (defaultCountryIso != null) { - ShortNumberUtil util = new ShortNumberUtil(); + ShortNumberInfo info = ShortNumberInfo.getInstance(); if (useExactMatch) { - return util.isEmergencyNumber(number, defaultCountryIso); + return info.isEmergencyNumber(number, defaultCountryIso); } else { - return util.connectsToEmergencyNumber(number, defaultCountryIso); + return info.connectsToEmergencyNumber(number, defaultCountryIso); } } diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index 39a9295ed8b6..ea87fa353169 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -998,7 +998,7 @@ public class ServiceState implements Parcelable { m.putString("data-operator-alpha-long", mDataOperatorAlphaLong); m.putString("data-operator-alpha-short", mDataOperatorAlphaShort); m.putString("data-operator-numeric", mDataOperatorNumeric); - m.putBoolean("manual", Boolean.valueOf(mIsManualNetworkSelection)); + m.putBoolean("manual", mIsManualNetworkSelection); m.putInt("radioTechnology", mRilVoiceRadioTechnology); m.putInt("dataRadioTechnology", mRilDataRadioTechnology); m.putBoolean("cssIndicator", mCssIndicator); @@ -1006,8 +1006,8 @@ public class ServiceState implements Parcelable { m.putInt("systemId", mSystemId); m.putInt("cdmaRoamingIndicator", mCdmaRoamingIndicator); m.putInt("cdmaDefaultRoamingIndicator", mCdmaDefaultRoamingIndicator); - m.putBoolean("emergencyOnly", Boolean.valueOf(mIsEmergencyOnly)); - m.putBoolean("isDataRoamingFromRegistration", Boolean.valueOf(mIsDataRoamingFromRegistration)); + m.putBoolean("emergencyOnly", mIsEmergencyOnly); + m.putBoolean("isDataRoamingFromRegistration", mIsDataRoamingFromRegistration); } /** @hide */ diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java index fced6670f6a3..e87cba137483 100644 --- a/telephony/java/android/telephony/SignalStrength.java +++ b/telephony/java/android/telephony/SignalStrength.java @@ -1046,7 +1046,7 @@ public class SignalStrength implements Parcelable { m.putInt("LteRssnr", mLteRssnr); m.putInt("LteCqi", mLteCqi); m.putInt("TdScdma", mTdScdmaRscp); - m.putBoolean("isGsm", Boolean.valueOf(isGsm)); + m.putBoolean("isGsm", isGsm); } /** diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 2304346abdb4..0875ff975e10 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -4974,7 +4974,7 @@ public class TelephonyManager { */ public boolean getSmsReceiveCapableForPhone(int phoneId, boolean defaultValue) { if (SubscriptionManager.isValidPhoneId(phoneId)) { - return Boolean.valueOf(TelephonyManager.getTelephonyProperty(phoneId, + return Boolean.parseBoolean(TelephonyManager.getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_SMS_RECEIVE, String.valueOf(defaultValue))); } @@ -5005,7 +5005,7 @@ public class TelephonyManager { */ public boolean getSmsSendCapableForPhone(int phoneId, boolean defaultValue) { if (SubscriptionManager.isValidPhoneId(phoneId)) { - return Boolean.valueOf(TelephonyManager.getTelephonyProperty(phoneId, + return Boolean.parseBoolean(TelephonyManager.getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_SMS_SEND, String.valueOf(defaultValue))); } |