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

Commit d3602b12 authored by Jack Yu's avatar Jack Yu
Browse files

Added service temporarily unavailable support 

Added a mechanism for underlying data service to report
service temporarily unavailable. In this case, frameworks
uses the configured retry timer to retry establishing data
connection again.

Fix: 184122463
Test: atest DataConnectionTest
Change-Id: I57705b720b6438d8f9f0076f83decc1c17782f6b
parent 0d0d1ae6

telephony/java/android/telephony/DataFailCause.java

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

     */

    public static final int NO_DEFAULT_DATA = 0x10008;

    public static final int NO_DEFAULT_DATA = 0x10008;





    /**

     * Data service is temporarily unavailable.

     *

     * @hide

     */

    public static final int SERVICE_TEMPORARILY_UNAVAILABLE = 0x10009;



    private static final Map<Integer, String> sFailCauseMap;

    private static final Map<Integer, String> sFailCauseMap;

    static {

    static {

        sFailCauseMap = new HashMap<>();

        sFailCauseMap = new HashMap<>();
@@ -1500,6 +1507,7 @@ public final class DataFailCause { 
        sFailCauseMap.put(HANDOVER_FAILED, "HANDOVER_FAILED");

        sFailCauseMap.put(HANDOVER_FAILED, "HANDOVER_FAILED");

        sFailCauseMap.put(DUPLICATE_CID, "DUPLICATE_CID");

        sFailCauseMap.put(DUPLICATE_CID, "DUPLICATE_CID");

        sFailCauseMap.put(NO_DEFAULT_DATA, "NO_DEFAULT_DATA");

        sFailCauseMap.put(NO_DEFAULT_DATA, "NO_DEFAULT_DATA");

        sFailCauseMap.put(SERVICE_TEMPORARILY_UNAVAILABLE, "SERVICE_TEMPORARILY_UNAVAILABLE");

    }

    }





    private DataFailCause() {

    private DataFailCause() {

telephony/java/android/telephony/data/DataServiceCallback.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -63,6 +63,11 @@ public class DataServiceCallback { 
    public static final int RESULT_ERROR_BUSY           = 3;

    public static final int RESULT_ERROR_BUSY           = 3;

    /** Request sent in illegal state */

    /** Request sent in illegal state */

    public static final int RESULT_ERROR_ILLEGAL_STATE  = 4;

    public static final int RESULT_ERROR_ILLEGAL_STATE  = 4;

    /**

     * Service is temporarily unavailable. Frameworks should retry the request again.

     * @hide

     */

    public static final int RESULT_ERROR_TEMPORARILY_UNAVAILABLE = 5;





    private final IDataServiceCallback mCallback;

    private final IDataServiceCallback mCallback;