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

Commit 7e7d2b34 authored by Stuart Scott's avatar Stuart Scott
Browse files

Default data should connect on user's preferred network type 

bug:18416275
bug:18415493

Change-Id: I14bce5520af67f038f43920a4454275c5a7e8a9f
parent 4bc9120d

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

+10 −3
Original line number Diff line number Diff line
@@ -17,17 +17,17 @@ 


package com.android.internal.telephony;



import com.android.internal.telephony.RadioCapability;



import android.content.Context;

import android.os.Message;

import android.os.RegistrantList;

import android.os.Registrant;

import android.os.Handler;

import android.os.AsyncResult;



import android.telephony.RadioAccessFamily;

import android.telephony.TelephonyManager;



import com.android.internal.telephony.RadioCapability;



/**

 * {@hide}

 */
@@ -104,6 +104,8 @@ public abstract class BaseCommands implements CommandsInterface { 
    protected int mPhoneType;

    // RIL Version

    protected int mRilVersion = -1;

    // Supported Radio Access Family

    protected int mSupportedRaf = RadioAccessFamily.RAF_UNKNOWN;



    public BaseCommands(Context context) {

        mContext = context;  // May be null (if so we won't log statistics)
@@ -845,6 +847,11 @@ public abstract class BaseCommands implements CommandsInterface { 
        return mRilVersion;

    }



    @Override

    public int getSupportedRadioAccessFamily() {

        return mSupportedRaf;

    }



    public void setUiccSubscription(int slotId, int appIndex, int subId, int subStatus,

            Message response) {

    }

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

+5 −0
Original line number Diff line number Diff line
@@ -1898,6 +1898,11 @@ public interface CommandsInterface { 
     */

    int getRilVersion();



    /**

     * @return Radio access families supported by the hardware.

     */

    int getSupportedRadioAccessFamily();



   /**

     * Sets user selected subscription at Modem.

     *

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

+8 −1
Original line number Diff line number Diff line
@@ -1914,6 +1914,13 @@ public interface Phone { 
     */

    public int getRadioAccessFamily();



    /**

     *  Get supported phone radio access family

     *

     *  @return a bit mask to identify the radio access family.

     */

    public int getSupportedRadioAccessFamily();



    /**

     * Registers the handler when phone radio  capability is changed.

     *

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

+5 −0
Original line number Diff line number Diff line
@@ -2009,6 +2009,11 @@ public abstract class PhoneBase extends Handler implements Phone { 
        return mRadioAccessFamily;

    }



    @Override

    public int getSupportedRadioAccessFamily() {

        return mCi.getSupportedRadioAccessFamily();

    }



    @Override

    public void registerForRadioCapabilityChanged(Handler h, int what, Object obj) {

        mCi.registerForRadioCapabilityChanged(h, what, obj);

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

+5 −0
Original line number Diff line number Diff line
@@ -1465,6 +1465,11 @@ public class PhoneProxy extends Handler implements Phone { 
        return mActivePhone.getRadioAccessFamily();

    }



    @Override

    public int getSupportedRadioAccessFamily() {

        return mCommandsInterface.getSupportedRadioAccessFamily();

    }



    @Override

    public void registerForRadioCapabilityChanged(Handler h, int what, Object obj) {

        mActivePhone.registerForRadioCapabilityChanged(h, what, obj);