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

Commit 3df8979a authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11084970 from 6098a061 to 24Q1-release 

Change-Id: I922c84ee90f4ccea63832a7f46cd76f3badad3bf
parents fb56736a 6098a061

flags/messaging.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -13,3 +13,10 @@ flag { 
  description: "This flag controls AP domain selection support for normal/emergency SMS."

  bug: "262804071"

}



flag {

  name: "mms_disabled_error"

  namespace: "telephony"

  description: "This flag controls the support of the new MMS error code MMS_ERROR_MMS_DISABLED."

  bug: "305062594"

}
 
 No newline at end of file

proto/src/persist_atoms.proto

+3 −0
Original line number Diff line number Diff line
@@ -677,4 +677,7 @@ message SatelliteSosMessageRecommender { 
    optional bool is_ims_registered = 3;

    optional int32 cellular_service_state = 4;

    optional int32 count = 5;

    optional bool is_multi_sim = 6;

    optional int32 recommending_handover_type = 7;

    optional bool is_satellite_allowed_in_current_location = 8;

}

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

+15 −0
Original line number Diff line number Diff line
@@ -2897,4 +2897,19 @@ public interface CommandsInterface { 
     * @param result Callback message to receive the result.

     */

    default void isN1ModeEnabled(Message result) {}



    /**

     * Enables or disables cellular identifier disclosure transparency.

     *

     * @param enable {@code true} to enable, {@code false} to disable.

     * @param result Callback message to receive the result.

     */

    default void setCellularIdentifierTransparencyEnabled(boolean enable, Message result) {}



    /**

     * Check whether cellular identifier transparency.

     *

     * @param result Callback message to receive the result.

     */

    default void isCellularIdentifierTransparencyEnabled(Message result) {}

}
 
 No newline at end of file

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

+17 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RESTRICTED_S 
import static com.android.internal.telephony.RILConstants.RIL_UNSOL_SIGNAL_STRENGTH;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_SUPP_SVC_NOTIFICATION;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_VOICE_RADIO_TECH_CHANGED;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_CELLULAR_IDENTIFIER_DISCLOSED;



import android.annotation.ElapsedRealtimeLong;

import android.hardware.radio.network.IRadioNetworkIndication;
@@ -421,6 +422,22 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
                new AsyncResult(null, response, null));

    }



    /**

     * Cellular identifier disclosure events

     * @param indicationType Type of radio indication

     * @param identifierDisclsoure the result of the Emergency Network Scan

     */

    public void cellularIdentifierDisclosed(int indicationType,

            android.hardware.radio.network.CellularIdentifierDisclosure identifierDisclsoure) {

        mRil.processIndication(HAL_SERVICE_NETWORK, indicationType);



        if (mRil.isLogOrTrace()) {

            mRil.unsljLogRet(RIL_UNSOL_CELLULAR_IDENTIFIER_DISCLOSED, identifierDisclsoure);

        }



        // TODO (b/276752426) notify registrants of identifier disclosure

    }



    @Override

    public String getInterfaceHash() {

        return IRadioNetworkIndication.HASH;

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

+24 −0
Original line number Diff line number Diff line
@@ -504,6 +504,30 @@ public class NetworkResponse extends IRadioNetworkResponse.Stub { 
        RadioResponse.responseVoid(HAL_SERVICE_NETWORK, mRil, responseInfo);

    }



    /**

     * @param responseInfo Response info struct containing response type, serial no. and error

     */

    public void setCellularIdentifierTransparencyEnabledResponse(RadioResponseInfo responseInfo) {

        RadioResponse.responseVoid(HAL_SERVICE_NETWORK, mRil, responseInfo);

    }



    /**

     * @param responseInfo Response info struct containing response type, serial no. and error.

     * @param isEnabled Indicates whether cellular identifier disclosure transparency from the modem

     *                  is enabled.

     */

    public void isCellularIdentifierTransparencyEnabledResponse(RadioResponseInfo responseInfo,

                                                        boolean isEnabled) {

        RILRequest rr = mRil.processResponse(HAL_SERVICE_NETWORK, responseInfo);



        if (rr != null) {

            if (responseInfo.error == RadioError.NONE) {

                RadioResponse.sendMessageResponse(rr.mResult, isEnabled);

            }

            mRil.processResponseDone(rr, responseInfo, isEnabled);

        }

    }



    @Override

    public String getInterfaceHash() {

        return IRadioNetworkResponse.HASH;