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

Commit fcfb72f8 authored by Bonian Chen's avatar Bonian Chen Committed by Automerger Merge Worker
Browse files

Merge "[Settings] Code reformat" into rvc-dev am: 73d33679 

Change-Id: I49229b925f740834e9279a83d37dde952066cba3
parents e324e709 73d33679

src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java

+9 −8
Original line number Original line Diff line number Diff line
@@ -461,8 +461,8 @@ public class EnabledNetworkModePreferenceController extends 
                case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:

                case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:

                case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:

                case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:

                    if (MobileNetworkUtils.isTdscdmaSupported(mContext, mSubId)) {

                    if (MobileNetworkUtils.isTdscdmaSupported(mContext, mSubId)) {

                        setSelectedEntry(

                        setSelectedEntry(TelephonyManagerConstants

                                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);

                                .NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);

                        setSummary(is5gEntryDisplayed()

                        setSummary(is5gEntryDisplayed()

                                ? R.string.network_lte_pure : R.string.network_lte);

                                ? R.string.network_lte_pure : R.string.network_lte);

                    } else {

                    } else {
@@ -498,8 +498,8 @@ public class EnabledNetworkModePreferenceController extends 
                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA:

                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA:

                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA:

                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA:

                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:

                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:

                    setSelectedEntry(

                    setSelectedEntry(TelephonyManagerConstants

                        TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);

                            .NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);

                    setSummary(mContext.getString(R.string.network_5G)

                    setSummary(mContext.getString(R.string.network_5G)

                            + mContext.getString(R.string.network_recommended));

                            + mContext.getString(R.string.network_recommended));

                    break;

                    break;
@@ -553,7 +553,8 @@ public class EnabledNetworkModePreferenceController extends 
                case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:

                case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:

                    return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA;

                    return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA;

                case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:

                case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:

                    return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;

                    return TelephonyManagerConstants

                            .NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;

                default:

                default:

                    return networkType; // not LTE

                    return networkType; // not LTE

            }

            }
@@ -654,7 +655,7 @@ public class EnabledNetworkModePreferenceController extends 
        }

        }





        private String[] getEntryValues() {

        private String[] getEntryValues() {

            Integer intArr[] = mEntriesValue.toArray(new Integer[0]);

            final Integer [] intArr = mEntriesValue.toArray(new Integer[0]);

            return Arrays.stream(intArr)

            return Arrays.stream(intArr)

                    .map(String::valueOf)

                    .map(String::valueOf)

                    .toArray(String[]::new);

                    .toArray(String[]::new);