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

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

Snap for 11111096 from 7435dea2 to 24Q1-release 

Change-Id: Iddd9a5f3de0e1f077dd625a0057a5714b84f01fe
parents ef32295e 7435dea2

flags/misc.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -56,3 +56,10 @@ flag { 
  description: "Load default data subid on create in PhoneGlobals."

  bug: "310591561"

}



flag {

  name: "enable_telephony_analytics"

  namespace: "telephony"

  description: "Enable Telephony Analytics information of Service State , Sms and Call scenarios"

  bug: "309896524"

}

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

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

     */

    default void isCellularIdentifierTransparencyEnabled(Message result) {}



    /**

     * Enables or disables security algorithm update reports.

     *

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

     * @param result Callback message to receive the result.

     */

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



    /**

     * Check whether security algorithm update reports are enabled.

     *

     * @param result Callback message to receive the result.

     */

    default void isSecurityAlgorithmsUpdatedEnabled(Message result) {}

}

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

+15 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import static com.android.internal.telephony.RILConstants.RIL_UNSOL_REGISTRATION 
import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED;

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

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

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

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;
@@ -438,6 +439,20 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
        // TODO (b/276752426) notify registrants of identifier disclosure

    }



    /**

     * Security algorithm update events

     * @param indicationType Type of radio indication

     * @param securityAlgorithmUpdate details of what changed

     */

    public void securityAlgorithmsUpdated(int indicationType,

            android.hardware.radio.network.SecurityAlgorithmUpdate securityAlgorithmUpdate) {

        mRil.processIndication(HAL_SERVICE_NETWORK, indicationType);



        if (mRil.isLogOrTrace()) {

            mRil.unsljLogRet(RIL_UNSOL_SECURITY_ALGORITHMS_UPDATED, securityAlgorithmUpdate);

        }

    }



    @Override

    public String getInterfaceHash() {

        return IRadioNetworkIndication.HASH;

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

+23 −0
Original line number Diff line number Diff line
@@ -528,6 +528,29 @@ public class NetworkResponse extends IRadioNetworkResponse.Stub { 
        }

    }



    /**

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

     */

    public void setSecurityAlgorithmsUpdatedEnabledResponse(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 security algorithm updates from the modem are enabled.

     */

    public void isSecurityAlgorithmsUpdatedEnabledResponse(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;

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

+1 −6
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
            mCi.registerForSrvccStateChanged(this, EVENT_SRVCC_STATE_CHANGED, null);

        }

        //Initialize Telephony Analytics

        if (isTelephonyAnalyticsEnabled()) {

        if (mFeatureFlags.enableTelephonyAnalytics()) {

            mTelephonyAnalytics = new TelephonyAnalytics(this);

        }

    }
@@ -4780,11 +4780,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        return mTelephonyAnalytics;

    }



    public boolean isTelephonyAnalyticsEnabled() {

        return mContext.getResources().getBoolean(

                com.android.internal.R.bool.telephony_analytics_switch);

    }



    /** @hide */

    public CarrierPrivilegesTracker getCarrierPrivilegesTracker() {

        return null;