Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 154779b6 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Change to disable mvno data field in ApnEditor if needed." am: c2c0edff 

am: 6ca28e83

Change-Id: I7e14539d3b22918c8d4a1aa4d41ba96afe88ca1c
parents 21e55623 6ca28e83

src/com/android/settings/ApnEditor.java

+5 −1
Original line number Diff line number Diff line
@@ -660,7 +660,11 @@ public class ApnEditor extends SettingsPreferenceFragment 
            return null;

        } else {

            String[] values = mRes.getStringArray(R.array.mvno_type_entries);

            mMvnoMatchData.setEnabled(mvnoIndex != 0);

            boolean mvnoMatchDataUneditable =

                    mReadOnlyApn || (mReadOnlyApnFields != null

                            && Arrays.asList(mReadOnlyApnFields)

                            .contains(Telephony.Carriers.MVNO_MATCH_DATA));

            mMvnoMatchData.setEnabled(!mvnoMatchDataUneditable && mvnoIndex != 0);

            if (newValue != null && newValue.equals(oldValue) == false) {

                if (values[mvnoIndex].equals("SPN")) {

                    mMvnoMatchData.setText(mTelephonyManager.getSimOperatorName());