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

Commit 12b97c47 authored by Derek Tan's avatar Derek Tan Committed by Android (Google) Code Review
Browse files

Merge "[DO NOT MERGE] Set RUIM as the default CDMA subscription source in Nova." into master-nova

parents 58d16730 9c47fd4d

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

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ public interface Phone { 
    static final int CDMA_SUBSCRIPTION_RUIM_SIM = 0; // RUIM/SIM (default)

    static final int CDMA_SUBSCRIPTION_NV       = 1; // NV -> non-volatile memory



    static final int PREFERRED_CDMA_SUBSCRIPTION = CDMA_SUBSCRIPTION_NV;

    static final int PREFERRED_CDMA_SUBSCRIPTION = CDMA_SUBSCRIPTION_RUIM_SIM;



    static final int TTY_MODE_OFF = 0;

    static final int TTY_MODE_FULL = 1;

src/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public class CdmaSubscriptionSourceManager extends Handler { 
    public static final int SUBSCRIPTION_SOURCE_UNKNOWN = -1;

    public static final int SUBSCRIPTION_FROM_RUIM      = 0; /* CDMA subscription from RUIM */

    public static final int SUBSCRIPTION_FROM_NV        = 1; /* CDMA subscription from NV */

    public static final int PREFERRED_CDMA_SUBSCRIPTION = SUBSCRIPTION_FROM_NV;

    public static final int PREFERRED_CDMA_SUBSCRIPTION = SUBSCRIPTION_FROM_RUIM;



    private static CdmaSubscriptionSourceManager sInstance;

    private static final Object sReferenceCountMonitor = new Object();