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

Commit c1e54e45 authored by Mengjun Leng's avatar Mengjun Leng Committed by Jack Yu
Browse files

Redefine constant variable EVENT_ALL_DATA_DISCONNECTED 

Redefine it to avoid duplicated definition.

Test: Telephony sanity tests
Bug: 129245657

Merged-In: Id2c54388a6abd177c9f797afa257184cfcc623ce
Change-Id: Id2c54388a6abd177c9f797afa257184cfcc623ce
(cherry picked from commit fd28c23b)
parent 36695293

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

+3 −2
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    protected static final int EVENT_GET_CALL_FORWARD_DONE       = 13;

    protected static final int EVENT_CALL_RING                   = 14;

    private static final int EVENT_CALL_RING_CONTINUE            = 15;

    private static final int EVENT_ALL_DATA_DISCONNECTED         = 16;



    // Used to intercept the carrier selection calls so that

    // we can save the values.
@@ -225,7 +224,9 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    protected static final int EVENT_DEVICE_PROVISIONING_DATA_SETTING_CHANGE = 50;

    protected static final int EVENT_GET_AVAILABLE_NETWORKS_DONE    = 51;



    protected static final int EVENT_LAST = EVENT_GET_AVAILABLE_NETWORKS_DONE;

    private static final int EVENT_ALL_DATA_DISCONNECTED         = 52;



    protected static final int EVENT_LAST = EVENT_ALL_DATA_DISCONNECTED;



    // For shared prefs.

    private static final String GSM_ROAMING_LIST_OVERRIDE_PREFIX = "gsm_roaming_list_";