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

Merge "Only default APN type can make preference selectable." into sc-dev am: 917021a2bd

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13622528

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icec5273d8018eac452c2439437a884de100b1cbd
This commit is contained in:
Tom Hsu
2021-02-19 16:18:23 +00:00
committed by Automerger Merge Worker
parent 9bce6b6b03 917021a2bd
commit 7e85a5acc6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/network/apn/ApnSettings.java
View File

@@ -43,6 +43,7 @@ import android.telephony.PreciseDataConnectionState;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.telephony.data.ApnSetting;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.Menu; import android.view.Menu;
@@ -344,7 +345,8 @@ public class ApnSettings extends RestrictedSettingsFragment
pref.setSummary(apn); pref.setSummary(apn);
} }
final boolean selectable = ((type == null) || !type.equals("mms")); final boolean selectable =
((type == null) || type.contains(ApnSetting.TYPE_DEFAULT_STRING));
pref.setSelectable(selectable); pref.setSelectable(selectable);
if (selectable) { if (selectable) {
if ((mSelectedKey != null) && mSelectedKey.equals(key)) { if ((mSelectedKey != null) && mSelectedKey.equals(key)) {