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

Commit 8c354b46 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5354487 from 9cc0f774 to qt-release

Change-Id: I9dfa1fbabf5e16141fb29e9e4e650bbb3fdfadf9
parents 1c8fa0e7 9cc0f774
Loading
Loading
Loading
Loading
+6 −6
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ public class CellularNetworkService extends NetworkService {
        CellularNetworkServiceProvider(int slotId) {
        CellularNetworkServiceProvider(int slotId) {
            super(slotId);
            super(slotId);


            mPhone = PhoneFactory.getPhone(getSlotId());
            mPhone = PhoneFactory.getPhone(getSlotIndex());


            mHandlerThread = new HandlerThread(CellularNetworkService.class.getSimpleName());
            mHandlerThread = new HandlerThread(CellularNetworkService.class.getSimpleName());
            mHandlerThread.start();
            mHandlerThread.start();
@@ -488,13 +488,13 @@ public class CellularNetworkService extends NetworkService {
    }
    }


    @Override
    @Override
    protected NetworkServiceProvider createNetworkServiceProvider(int slotId) {
    public NetworkServiceProvider onCreateNetworkServiceProvider(int slotIndex) {
        if (DBG) log("Cellular network service created for slot " + slotId);
        if (DBG) log("Cellular network service created for slot " + slotIndex);
        if (!SubscriptionManager.isValidSlotIndex(slotId)) {
        if (!SubscriptionManager.isValidSlotIndex(slotIndex)) {
            loge("Tried to Cellular network service with invalid slotId " + slotId);
            loge("Tried to Cellular network service with invalid slotId " + slotIndex);
            return null;
            return null;
        }
        }
        return new CellularNetworkServiceProvider(slotId);
        return new CellularNetworkServiceProvider(slotIndex);
    }
    }


    private void log(String s) {
    private void log(String s) {
+14 −4
Original line number Original line Diff line number Diff line
@@ -85,6 +85,7 @@ import android.telephony.ServiceState;
import android.telephony.SmsManager;
import android.telephony.SmsManager;
import android.telephony.TelephonyHistogram;
import android.telephony.TelephonyHistogram;
import android.telephony.TelephonyManager;
import android.telephony.TelephonyManager;
import android.telephony.TelephonyManager.PrefNetworkMode;
import android.telephony.data.ApnSetting;
import android.telephony.data.ApnSetting;
import android.telephony.data.DataCallResponse;
import android.telephony.data.DataCallResponse;
import android.telephony.data.DataProfile;
import android.telephony.data.DataProfile;
@@ -1494,7 +1495,8 @@ public class RIL extends BaseCommands implements CommandsInterface {


                    if (RILJ_LOGD) {
                    if (RILJ_LOGD) {
                        riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                        riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                                + ",accessNetworkType=" + accessNetworkType + ",isRoaming="
                                + ",accessNetworkType="
                                + AccessNetworkType.toString(accessNetworkType) + ",isRoaming="
                                + isRoaming + ",allowRoaming=" + allowRoaming + "," + dataProfile
                                + isRoaming + ",allowRoaming=" + allowRoaming + "," + dataProfile
                                + ",addresses=" + addresses + ",dnses=" + dnses);
                                + ",addresses=" + addresses + ",dnses=" + dnses);
                    }
                    }
@@ -1512,7 +1514,8 @@ public class RIL extends BaseCommands implements CommandsInterface {


                    if (RILJ_LOGD) {
                    if (RILJ_LOGD) {
                        riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                        riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                                + ",accessNetworkType=" + accessNetworkType + ",isRoaming="
                                + ",accessNetworkType="
                                + AccessNetworkType.toString(accessNetworkType) + ",isRoaming="
                                + isRoaming + ",allowRoaming=" + allowRoaming + ","
                                + isRoaming + ",allowRoaming=" + allowRoaming + ","
                                + dataProfile + ",addresses=" + addresses + ",dnses=" + dnses);
                                + dataProfile + ",addresses=" + addresses + ",dnses=" + dnses);
                    }
                    }
@@ -2574,7 +2577,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
    }
    }


    @Override
    @Override
    public void setPreferredNetworkType(int networkType , Message result) {
    public void setPreferredNetworkType(@PrefNetworkMode int networkType , Message result) {
        IRadio radioProxy = getRadioProxy(result);
        IRadio radioProxy = getRadioProxy(result);
        if (radioProxy != null) {
        if (radioProxy != null) {
            RILRequest rr = obtainRequest(RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, result,
            RILRequest rr = obtainRequest(RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, result,
@@ -2598,7 +2601,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
                        (android.hardware.radio.V1_4.IRadio) radioProxy;
                        (android.hardware.radio.V1_4.IRadio) radioProxy;
                try {
                try {
                    radioProxy14.setPreferredNetworkTypeBitmap(
                    radioProxy14.setPreferredNetworkTypeBitmap(
                            rr.mSerial, RadioAccessFamily.getRafFromNetworkType(networkType));
                            rr.mSerial, convertToHalRadioAccessFamily(networkType));
                } catch (RemoteException | RuntimeException e) {
                } catch (RemoteException | RuntimeException e) {
                    handleRadioProxyExceptionForRR(rr, "setPreferredNetworkTypeBitmap", e);
                    handleRadioProxyExceptionForRR(rr, "setPreferredNetworkTypeBitmap", e);
                }
                }
@@ -2606,6 +2609,13 @@ public class RIL extends BaseCommands implements CommandsInterface {
        }
        }
    }
    }


    private static int convertToHalRadioAccessFamily(@PrefNetworkMode int networkMode) {
        // android.hardware.radio.V1_0.RadioAccessFamily is one bit shift
        // from TelephonyManager.NetworkTypeBitMask
        int networkTypeBitmask = RadioAccessFamily.getRafFromNetworkType(networkMode);
        return networkTypeBitmask << 1;
    }

    @Override
    @Override
    public void getPreferredNetworkType(Message result) {
    public void getPreferredNetworkType(Message result) {
        IRadio radioProxy = getRadioProxy(result);
        IRadio radioProxy = getRadioProxy(result);
+193 −83

File changed.

Preview size limit exceeded, changes collapsed.

+5 −2

File changed.

Preview size limit exceeded, changes collapsed.

+14 −14

File changed.

Preview size limit exceeded, changes collapsed.

Loading