From c9e85fd21a155b30d0450f86e26a5f4693c0e28a Mon Sep 17 00:00:00 2001 From: Taesu Lee Date: Tue, 16 Jun 2020 11:00:42 +0900 Subject: [PATCH] Remove unnecessary methods from MmsUtils Same methods in PhoneUtils are used everywhere instead. Test: Build Signed-off-by: Taesu Lee Change-Id: Ia17c1f17511c53a9235af462fa0809146726e89f --- src/com/android/messaging/sms/MmsUtils.java | 24 --------------------- 1 file changed, 24 deletions(-) diff --git a/src/com/android/messaging/sms/MmsUtils.java b/src/com/android/messaging/sms/MmsUtils.java index a469af3..e8e8713 100644 --- a/src/com/android/messaging/sms/MmsUtils.java +++ b/src/com/android/messaging/sms/MmsUtils.java @@ -1111,20 +1111,6 @@ public class MmsUtils { return subject; } - /** - * @return Whether the data roaming is enabled - */ - private static boolean isDataRoamingEnabled() { - boolean dataRoamingEnabled = false; - final ContentResolver cr = Factory.get().getApplicationContext().getContentResolver(); - if (OsUtil.isAtLeastJB_MR1()) { - dataRoamingEnabled = (Settings.Global.getInt(cr, Settings.Global.DATA_ROAMING, 0) != 0); - } else { - dataRoamingEnabled = (Settings.System.getInt(cr, Settings.System.DATA_ROAMING, 0) != 0); - } - return dataRoamingEnabled; - } - /** * @return Whether to auto retrieve MMS */ @@ -2051,16 +2037,6 @@ public class MmsUtils { return !phoneUtils.isAirplaneModeOn(); } - public static boolean isMobileDataEnabled(final int subId) { - final PhoneUtils phoneUtils = PhoneUtils.get(subId); - return phoneUtils.isMobileDataEnabled(); - } - - public static boolean isAirplaneModeOn(final int subId) { - final PhoneUtils phoneUtils = PhoneUtils.get(subId); - return phoneUtils.isAirplaneModeOn(); - } - public static StatusPlusUri sendMmsMessage(final Context context, final int subId, final Uri messageUri, final Bundle extras) { int status = MMS_REQUEST_MANUAL_RETRY;