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

Commit 495fe7df authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12755599 from aac095e9 to 25Q1-release 

Change-Id: Ic372b3aa7999abb2988d8684279faa70a5d16809
parents 9ff4c574 aac095e9

flags/data.aconfig

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ flag { 
  }

}



# OWNER=TBD TARGET=TBD

# OWNER=jackyu TARGET=25Q2

flag {

  name: "oem_paid_private"

  namespace: "telephony"

flags/misc.aconfig

+16 −0
Original line number Diff line number Diff line
@@ -230,3 +230,19 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}



# OWNER=jackyu TARGET=25Q2

flag {

    name: "deprecate_cdma"

    namespace: "telephony"

    description: "Deprecate CDMA and NV APIS"

    bug: "379356026"

}



# OWNER=jackyu TARGET=25Q2

flag {

    name: "cleanup_cdma"

    namespace: "telephony"

    description: "Disable CDMA and NV backing code"

    bug: "379356026"

}

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

+18 −0
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ import com.android.internal.telephony.uicc.IccSlotStatus; 
import com.android.internal.telephony.uicc.IccUtils;

import com.android.internal.telephony.uicc.PortUtils;

import com.android.internal.telephony.uicc.SimPhonebookRecord;

import com.android.internal.telephony.uicc.SimTypeInfo;

import com.android.telephony.Rlog;



import java.io.ByteArrayInputStream;
@@ -5879,6 +5880,23 @@ public class RILUtils { 
                securityAlgorithmUpdate.isUnprotectedEmergency);

    }



    /** Convert an AIDL-based SimTypeInfo to its Java wrapper. */

    public static ArrayList<SimTypeInfo> convertAidlSimTypeInfo(

            android.hardware.radio.config.SimTypeInfo[] simTypeInfos) {

        ArrayList<SimTypeInfo> response = new ArrayList<>();

        if (simTypeInfos == null) {

            loge("convertAidlSimTypeInfo received NULL simTypeInfos");

            return response;

        }

        for (android.hardware.radio.config.SimTypeInfo simTypeInfo : simTypeInfos) {

            SimTypeInfo info = new SimTypeInfo();

            info.mSupportedSimTypes = simTypeInfo.supportedSimTypes;

            info.setCurrentSimType(simTypeInfo.currentSimType);

            response.add(info);

        }

        return response;

    }



    private static void logd(String log) {

        Rlog.d("RILUtils", log);

    }

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

+52 −18
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ import android.os.RemoteException; 
import android.telephony.PhoneCapability;



import com.android.internal.telephony.uicc.IccSlotStatus;

import com.android.internal.telephony.uicc.SimTypeInfo;

import com.android.telephony.Rlog;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.Set;



/**
@@ -47,8 +47,7 @@ public class RadioConfigResponseAidl extends 
     */

    @Override

    public void getHalDeviceCapabilitiesResponse(

            android.hardware.radio.RadioResponseInfo info,

            boolean modemReducedFeatureSet1) throws RemoteException {

            RadioResponseInfo info, boolean modemReducedFeatureSet1) throws RemoteException {

        // convert hal device capabilities to RadioInterfaceCapabilities

        RILRequest rr = mRadioConfig.processResponse(info);

        if (rr != null) {
@@ -71,8 +70,7 @@ public class RadioConfigResponseAidl extends 
     */

    @Override

    public void getNumOfLiveModemsResponse(

            android.hardware.radio.RadioResponseInfo info, byte numOfLiveModems)

            throws RemoteException {

            RadioResponseInfo info, byte numOfLiveModems) throws RemoteException {

        RILRequest rr = mRadioConfig.processResponse(info);

        if (rr != null) {

            if (info.error == android.hardware.radio.RadioError.NONE) {
@@ -93,9 +91,8 @@ public class RadioConfigResponseAidl extends 
     */

    @Override

    public void getPhoneCapabilityResponse(

            android.hardware.radio.RadioResponseInfo info,

            android.hardware.radio.config.PhoneCapability phoneCapability)

            throws RemoteException {

            RadioResponseInfo info,

            android.hardware.radio.config.PhoneCapability phoneCapability) throws RemoteException {

        RILRequest rr = mRadioConfig.processResponse(info);

        if (rr != null) {

            PhoneCapability ret = RILUtils.convertHalPhoneCapability(
@@ -118,9 +115,7 @@ public class RadioConfigResponseAidl extends 
     */

    @Override

    public void getSimultaneousCallingSupportResponse(

            android.hardware.radio.RadioResponseInfo info,

            int[] enabledLogicalSlots)

            throws RemoteException {

            RadioResponseInfo info, int[] enabledLogicalSlots) throws RemoteException {

        RILRequest rr = mRadioConfig.processResponse(info);

        if (rr != null) {

            ArrayList<Integer> ret = RILUtils.primitiveArrayToArrayList(enabledLogicalSlots);
@@ -142,7 +137,7 @@ public class RadioConfigResponseAidl extends 
     */

    @Override

    public void getSimSlotsStatusResponse(

            android.hardware.radio.RadioResponseInfo info,

            RadioResponseInfo info,

            android.hardware.radio.config.SimSlotStatus[] slotStatus)

            throws RemoteException {

        RILRequest rr = mRadioConfig.processResponse(info);
@@ -166,8 +161,7 @@ public class RadioConfigResponseAidl extends 
     * Currently this is being used as the callback for RadioConfig.setNumOfLiveModems() method

     */

    @Override

    public void setNumOfLiveModemsResponse(

            android.hardware.radio.RadioResponseInfo info) throws RemoteException {

    public void setNumOfLiveModemsResponse(RadioResponseInfo info) throws RemoteException {

        RILRequest rr = mRadioConfig.processResponse(info);

        if (rr != null) {

            if (info.error == android.hardware.radio.RadioError.NONE) {
@@ -187,8 +181,7 @@ public class RadioConfigResponseAidl extends 
     * Response function for IRadioConfig.setPreferredDataModem().

     */

    @Override

    public void setPreferredDataModemResponse(

            android.hardware.radio.RadioResponseInfo info) throws RemoteException {

    public void setPreferredDataModemResponse(RadioResponseInfo info) throws RemoteException {

        RILRequest rr = mRadioConfig.processResponse(info);

        if (rr != null) {

            if (info.error == android.hardware.radio.RadioError.NONE) {
@@ -208,8 +201,7 @@ public class RadioConfigResponseAidl extends 
     * Response function for IRadioConfig.setSimSlotsMapping().

     */

    @Override

    public void setSimSlotsMappingResponse(

            android.hardware.radio.RadioResponseInfo info) throws RemoteException {

    public void setSimSlotsMappingResponse(RadioResponseInfo info) throws RemoteException {

        RILRequest rr = mRadioConfig.processResponse(info);

        if (rr != null) {

            if (info.error == android.hardware.radio.RadioError.NONE) {
@@ -225,6 +217,48 @@ public class RadioConfigResponseAidl extends 
        }

    }



    /**

     * Response function for IRadioConfig.getSimTypeInfo().

     */

    @Override

    public void getSimTypeInfoResponse(

            RadioResponseInfo info,

            android.hardware.radio.config.SimTypeInfo[] simTypeInfo) throws RemoteException {

        RILRequest rr = mRadioConfig.processResponse(info);

        if (rr != null) {

            ArrayList<SimTypeInfo> ret = RILUtils.convertAidlSimTypeInfo(simTypeInfo);

            if (info.error == android.hardware.radio.RadioError.NONE) {

                // send response

                RadioResponse.sendMessageResponse(rr.mResult, ret);

                logd(rr, RILUtils.requestToString(rr.mRequest) + " " + ret.toString());

            } else {

                rr.onError(info.error, null);

                loge(rr, RILUtils.requestToString(rr.mRequest) + " error " + info.error);

            }

        } else {

            loge("getSimTypeInfoResponse: Error " + info.toString());

        }

    }



    /**

     * Response function for IRadioConfig.setSimTypeResponse().

     */

    @Override

    public void setSimTypeResponse(RadioResponseInfo info) throws RemoteException {

        RILRequest rr = mRadioConfig.processResponse(info);

        if (rr != null) {

            if (info.error == android.hardware.radio.RadioError.NONE) {

                // send response

                RadioResponse.sendMessageResponse(rr.mResult, null);

                logd(rr, RILUtils.requestToString(rr.mRequest));

            } else {

                rr.onError(info.error, null);

                loge(rr, RILUtils.requestToString(rr.mRequest) + " error " + info.error);

            }

        } else {

            loge("setSimTypeResponse: Error " + info.toString());

        }

    }

    private static void logd(String log) {

        Rlog.d(TAG, log);

    }

src/java/com/android/internal/telephony/satellite/SatelliteController.java

+4 −4
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ROAMING_P2P_S 
import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ROAMING_P2P_SMS_SUPPORTED_BOOL;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ROAMING_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ROAMING_TURN_OFF_SESSION_FOR_EMERGENCY_CALL_BOOL;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_SOS_MAX_DATAGRAM_SIZE;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_SOS_MAX_DATAGRAM_SIZE_BYTES_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_SUPPORTED_MSG_APPS_STRING_ARRAY;

import static android.telephony.SubscriptionManager.SATELLITE_ATTACH_ENABLED_FOR_CARRIER;

import static android.telephony.SubscriptionManager.SATELLITE_ENTITLEMENT_STATUS;
@@ -5425,7 +5425,7 @@ public class SatelliteController extends Handler { 
                        KEY_SATELLITE_ROAMING_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT,

                        KEY_SATELLITE_ROAMING_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT,

                        KEY_SATELLITE_ROAMING_ESOS_INACTIVITY_TIMEOUT_SEC_INT,

                        KEY_SATELLITE_SOS_MAX_DATAGRAM_SIZE,

                        KEY_SATELLITE_SOS_MAX_DATAGRAM_SIZE_BYTES_INT,

                        KEY_SATELLITE_SUPPORTED_MSG_APPS_STRING_ARRAY,

                        KEY_REGIONAL_SATELLITE_EARFCN_BUNDLE,

                        KEY_SATELLITE_DATA_SUPPORT_MODE_INT
@@ -7998,8 +7998,8 @@ public class SatelliteController extends Handler { 
    private void overrideSatelliteCapabilitiesIfApplicable() {

        int subId = getSelectedSatelliteSubId();

        PersistableBundle config = getPersistableBundle(subId);

        if (config.containsKey(KEY_SATELLITE_SOS_MAX_DATAGRAM_SIZE)) {

            int datagramSize = config.getInt(KEY_SATELLITE_SOS_MAX_DATAGRAM_SIZE);

        if (config.containsKey(KEY_SATELLITE_SOS_MAX_DATAGRAM_SIZE_BYTES_INT)) {

            int datagramSize = config.getInt(KEY_SATELLITE_SOS_MAX_DATAGRAM_SIZE_BYTES_INT);

            SubscriptionInfo subInfo = mSubscriptionManagerService.getSubscriptionInfo(subId);

            if (!(subInfo == null || subInfo.isOnlyNonTerrestrialNetwork())) {

                synchronized (mSatelliteCapabilitiesLock) {