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

Commit 66c34077 authored by Jack Yu's avatar Jack Yu
Browse files

Fixed several data issues 

1. Added workaround for changing immutable capabilities
   until connectivity service supports it.
2. Fixed that logging tag suffix after transport changed.
3. Port VCN code from old data stack.
4. Fixed some cases that we need to tear down the underlying
   networks, but also inform data network controller of
   data setup fails, for example, no live network request
   or VCN requested tear down before creating the agent.
5. Fixed the incorrect link status report.
6. Attach/Detach network requests after network capabilities
   changed.
7. Support the legacy permanent fail cause carrier config.

Fix: 215901070
Test: atest DataNetworkControllerTest
Change-Id: Icd3b43cb897b09af3dc5a9bc90ac104457e34190
parent b96f60f5

telephony/java/android/telephony/DataFailCause.java

+11 −0
Original line number Diff line number Diff line
@@ -1083,6 +1083,13 @@ public final class DataFailCause { 
     */

    public static final int REQUEST_NOT_SUPPORTED = 0x1000A;



    /**

     * An internal setup data error initiated by telephony that no retry should be performed.

     *

     * @hide

     */

    public static final int NO_RETRY_FAILURE = 0x1000B;



    private static final Map<Integer, String> sFailCauseMap;

    static {

        sFailCauseMap = new HashMap<>();
@@ -1515,6 +1522,8 @@ public final class DataFailCause { 
        sFailCauseMap.put(DUPLICATE_CID, "DUPLICATE_CID");

        sFailCauseMap.put(NO_DEFAULT_DATA, "NO_DEFAULT_DATA");

        sFailCauseMap.put(SERVICE_TEMPORARILY_UNAVAILABLE, "SERVICE_TEMPORARILY_UNAVAILABLE");

        sFailCauseMap.put(REQUEST_NOT_SUPPORTED, "REQUEST_NOT_SUPPORTED");

        sFailCauseMap.put(NO_RETRY_FAILURE, "NO_RETRY_FAILURE");

    }



    private DataFailCause() {
@@ -1565,6 +1574,7 @@ public final class DataFailCause { 
    }



    /** @hide */

    // TODO: Migrated to DataConfigManager

    public static boolean isPermanentFailure(@NonNull Context context,

                                             @DataFailureCause int failCause,

                                             int subId) {
@@ -1621,6 +1631,7 @@ public final class DataFailCause { 
                    };

                }



                permanentFailureSet.add(NO_RETRY_FAILURE);

                sPermanentFailureCache.put(subId, permanentFailureSet);

            }