From 44fb1904e30b39637d846b9d2ca3aebc82e9f828 Mon Sep 17 00:00:00 2001 From: Taesu Lee Date: Fri, 15 Nov 2019 16:16:08 +0900 Subject: SMS service loads MMS config directly instead getCarrierConfigValues() is removed from MmsManager and SMS service loads Carrier configuration values directly since MmsService could return null or cached config instead if an app requests the config by receiving ACTION_CARRIER_CONFIG_CHANGED before the config is loaded newly in MmsService by ACTION_CARRIER_CONFIG_CHANGED. Bug: 145768042 Test: manual Change-Id: Idc21015cab2902bd0f67e2131ea89b04c4fc4f5e Signed-off-by: Taesu Lee --- mms/java/android/telephony/MmsManager.java | 18 ------------------ mms/java/com/android/internal/telephony/IMms.aidl | 7 ------- 2 files changed, 25 deletions(-) (limited to 'mms') diff --git a/mms/java/android/telephony/MmsManager.java b/mms/java/android/telephony/MmsManager.java index 4bcf04691652..65542673a607 100644 --- a/mms/java/android/telephony/MmsManager.java +++ b/mms/java/android/telephony/MmsManager.java @@ -97,22 +97,4 @@ public class MmsManager { // Ignore it } } - - /** - * Get carrier-dependent configuration values. - * - * @param subId the subscription id - * @return bundle key/values pairs of configuration values - */ - public Bundle getCarrierConfigValues(int subId) { - try { - IMms iMms = IMms.Stub.asInterface(ServiceManager.getService("imms")); - if (iMms != null) { - return iMms.getCarrierConfigValues(subId); - } - } catch (RemoteException ex) { - // ignore it - } - return null; - } } diff --git a/mms/java/com/android/internal/telephony/IMms.aidl b/mms/java/com/android/internal/telephony/IMms.aidl index fa5073ef1c7e..8be511186800 100644 --- a/mms/java/com/android/internal/telephony/IMms.aidl +++ b/mms/java/com/android/internal/telephony/IMms.aidl @@ -59,13 +59,6 @@ interface IMms { in Uri contentUri, in Bundle configOverrides, in PendingIntent downloadedIntent); - /** - * Get carrier-dependent configuration values. - * - * @param subId the SIM id - */ - Bundle getCarrierConfigValues(int subId); - /** * Import a text message into system's SMS store * -- cgit v1.2.3