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

Commit eecd666b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Dual data feature" into atel.lnx.2.0-dev

parents 898641b8 38ffd186
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -81,11 +81,8 @@ public class PhoneFactory {

    static private final HashMap<String, LocalLog>sLocalLogs = new HashMap<String, LocalLog>();

    //property to get max data run time
    private static final String OVERRIDE_MODEM_DUAL_DATA_CAP_PROP = "persist.radio.msim.data.cap";
    // TODO - make this a dynamic property read from the modem
    public static final int MAX_ACTIVE_PHONES = SystemProperties.getInt(
            OVERRIDE_MODEM_DUAL_DATA_CAP_PROP, 1);
    public static final int MAX_ACTIVE_PHONES = 1;

    //***** Class Methods

+11 −8
Original line number Diff line number Diff line
@@ -60,31 +60,34 @@ import java.util.List;
 * the active phones.  Note we don't wait for data attach (which may not happen anyway).
 */
public class PhoneSwitcher extends Handler {
    private final static String LOG_TAG = "PhoneSwitcher";
    private final static boolean VDBG = false;
    protected final static String LOG_TAG = "PhoneSwitcher";
    protected final static boolean VDBG = false;

    private final int mMaxActivePhones;
    protected int mMaxActivePhones;
    protected final List<DcRequest> mPrioritizedDcRequests = new ArrayList<DcRequest>();
    protected final RegistrantList[] mActivePhoneRegistrants;
    protected final SubscriptionController mSubscriptionController;
    private final int[] mPhoneSubscriptions;
    protected final int[] mPhoneSubscriptions;
    protected final CommandsInterface[] mCommandsInterfaces;
    protected final Context mContext;
    protected final PhoneState[] mPhoneStates;
    protected final int mNumPhones;
    private final Phone[] mPhones;
    protected final Phone[] mPhones;
    private final LocalLog mLocalLog;

    protected int mDefaultDataSubscription;

    protected final static int EVENT_DEFAULT_SUBSCRIPTION_CHANGED = 101;
    private final static int EVENT_SUBSCRIPTION_CHANGED         = 102;
    protected final static int EVENT_SUBSCRIPTION_CHANGED         = 102;
    protected final static int EVENT_REQUEST_NETWORK              = 103;
    private final static int EVENT_RELEASE_NETWORK              = 104;
    private final static int EVENT_EMERGENCY_TOGGLE             = 105;
    private final static int EVENT_RESEND_DATA_ALLOWED          = 106;
    protected final static int EVENT_ALLOW_DATA_RESPONSE        = 107;
    protected final static int EVENT_VOICE_CALL_ENDED           = 108;
    protected final static int EVENT_DATA_RAT_CHANGED           = 109;
    protected static final int EVENT_UNSOL_MAX_DATA_ALLOWED_CHANGED = 110;
    protected static final int EVENT_OEM_HOOK_SERVICE_READY = 111;

    private final static int MAX_LOCAL_LOG_LINES = 30;

@@ -208,7 +211,7 @@ public class PhoneSwitcher extends Handler {
        }
    }

    private boolean isEmergency() {
    protected boolean isEmergency() {
        for (Phone p : mPhones) {
            if (p == null) continue;
            if (p.isInEcm() || p.isInEmergencyCall()) return true;
@@ -335,7 +338,7 @@ public class PhoneSwitcher extends Handler {
        public long lastRequested = 0;
    }

    private void deactivate(int phoneId) {
    protected void deactivate(int phoneId) {
        PhoneState state = mPhoneStates[phoneId];
        if (state.active == false) return;
        state.active = false;