PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use displayName instead of operator name in MMS data notification" into qt-dev

Browse Source 
am: 40e9ffc2f0

Change-Id: Ie50c5041ef4b9df9ef015cd5f147b1c45956893f
This commit is contained in:
Antony Sargent
2019-06-18 16:02:39 -07:00
committed by android-build-merger
parent afd0e671c7 40e9ffc2f0
commit ff1c4940c8
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/sim/SimSelectNotification.java
View File

@@ -40,12 +40,14 @@ import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
import android.provider.Settings;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.network.telephony.MobileNetworkActivity;
import com.android.settingslib.HelpUtils;
@@ -104,6 +106,11 @@ public class SimSelectNotification extends BroadcastReceiver {
Log.w(TAG, "onEnableMmsDataRequest invalid sub ID " + subId);
return;
}
final SubscriptionInfo info = subscriptionManager.getActiveSubscriptionInfo(subId);
if (info == null) {
Log.w(TAG, "onEnableMmsDataRequest null SubscriptionInfo for sub ID " + subId);
return;
}
// Getting request reason from extra, which will determine the notification title.
CharSequence notificationTitle = null;
@@ -128,7 +135,7 @@ public class SimSelectNotification extends BroadcastReceiver {
}
CharSequence notificationSummary = context.getResources().getString(
R.string.enable_mms_notification_summary, tm.getSimOperatorName());
R.string.enable_mms_notification_summary, SubscriptionUtil.getDisplayName(info));
cancelEnableMmsNotification(context);