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

Commit 77961f0e authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge changes from topics "getApnTypeString", "qns_switched_pref" am: f24f9a73 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1763676

Change-Id: I5c65c094dbfcfa1b1fa0e045316ce459ac091db7
parents 8f663184 f24f9a73

src/java/com/android/internal/telephony/RetryManager.java

+3 −3
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ public class RetryManager { 
                        if (splitStr.length == 2) {

                            String apnTypeStr = splitStr[0].trim();

                            // Check if this retry pattern is for the APN we want.

                            if (apnTypeStr.equals(ApnSetting.getApnTypeStringInternal(apnType))) {

                            if (apnTypeStr.equals(ApnSetting.getApnTypeString(apnType))) {

                                // Extract the config string. Note that an empty string is valid

                                // here, meaning no retry for the specified APN.

                                configString = splitStr[1];
@@ -697,7 +697,7 @@ public class RetryManager { 


    public String toString() {

        if (mConfig == null) return "";

        return "RetryManager: apnType=" + ApnSetting.getApnTypeStringInternal(apnType)

        return "RetryManager: apnType=" + ApnSetting.getApnTypeString(apnType)

                + " mRetryCount="

                + mRetryCount + " mMaxRetryCount=" + mMaxRetryCount + " mCurrentApnIndex="

                + mCurrentApnIndex + " mSameApnRtryCount=" + mSameApnRetryCount
@@ -709,6 +709,6 @@ public class RetryManager { 


    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    private void log(String s) {

        Rlog.d(LOG_TAG, "[" + ApnSetting.getApnTypeStringInternal(apnType) + "] " + s);

        Rlog.d(LOG_TAG, "[" + ApnSetting.getApnTypeString(apnType) + "] " + s);

    }

}

src/java/com/android/internal/telephony/dataconnection/AccessNetworksManager.java

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ public class AccessNetworksManager extends Handler { 
                accessNetworkStrings.add(AccessNetworkType.toString(network));

            }

            return "[QualifiedNetworks: apnType="

                    + ApnSetting.getApnTypeStringInternal(apnType)

                    + ApnSetting.getApnTypeString(apnType)

                    + ", networks="

                    + Arrays.stream(qualifiedNetworks)

                    .mapToObj(type -> AccessNetworkType.toString(type))
@@ -475,7 +475,7 @@ public class AccessNetworksManager extends Handler { 


        for (int i = 0; i < mAvailableNetworks.size(); i++) {

            pw.println("APN type "

                    + ApnSetting.getApnTypeStringInternal(mAvailableNetworks.keyAt(i))

                    + ApnSetting.getApnTypeString(mAvailableNetworks.keyAt(i))

                    + ": [" + Arrays.stream(mAvailableNetworks.valueAt(i))

                    .mapToObj(AccessNetworkType::toString)

                    .collect(Collectors.joining(",")) + "]");

src/java/com/android/internal/telephony/dataconnection/ApnContext.java

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ public class ApnContext { 
     * @param priority Priority of APN type

     */

    public ApnContext(Phone phone, int typeId, String logTag, DcTracker tracker, int priority) {

        this(phone, ApnSetting.getApnTypeStringInternal(typeId), logTag, tracker, priority);

        this(phone, ApnSetting.getApnTypeString(typeId), logTag, tracker, priority);

    }



    /**

src/java/com/android/internal/telephony/dataconnection/ApnSettingUtils.java

+3 −3
Original line number Diff line number Diff line
@@ -162,8 +162,8 @@ public class ApnSettingUtils { 
                    + Arrays.toString(meteredApnSet.toArray()));

        }



        if (meteredApnSet.contains(ApnSetting.getApnTypeStringInternal(apnType))) {

            if (DBG) Rlog.d(LOG_TAG, ApnSetting.getApnTypeStringInternal(apnType) + " is metered.");

        if (meteredApnSet.contains(ApnSetting.getApnTypeString(apnType))) {

            if (DBG) Rlog.d(LOG_TAG, ApnSetting.getApnTypeString(apnType) + " is metered.");

            return true;

        } else if (apnType == ApnSetting.TYPE_ALL) {

            // Assuming no configuration error, if at least one APN type is
@@ -174,7 +174,7 @@ public class ApnSettingUtils { 
            }

        }



        if (DBG) Rlog.d(LOG_TAG, ApnSetting.getApnTypeStringInternal(apnType) + " is not metered.");

        if (DBG) Rlog.d(LOG_TAG, ApnSetting.getApnTypeString(apnType) + " is not metered.");

        return false;

    }

src/java/com/android/internal/telephony/dataconnection/DataEnabledOverride.java

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ public class DataEnabledOverride { 


        @Override

        public String toString() {

            return ApnSetting.getApnTypeStringInternal(mApnType) + "=" + mRequiredConditions;

            return ApnSetting.getApnTypeString(mApnType) + "=" + mRequiredConditions;

        }



        @Override