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

Commit 5498404b authored by Michael Groover's avatar Michael Groover Committed by Android (Google) Code Review
Browse files

Merge "Update null cipher notification mutator API naming to match accessor" into main

parents 1f5ce1eb 10880b32

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -14848,11 +14848,11 @@ package android.telephony { 
    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataRoamingEnabled(boolean);

    method @FlaggedApi("com.android.internal.telephony.flags.enable_identifier_disclosure_transparency") @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setEnableCellularIdentifierDisclosureNotifications(boolean);

    method @FlaggedApi("com.android.internal.telephony.flags.enable_modem_cipher_transparency") @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setEnableNullCipherNotifications(boolean);

    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.PinResult setIccLockEnabled(boolean, @NonNull String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMobileDataPolicyEnabled(int, boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultiSimCarrierRestriction(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setNrDualConnectivityState(int);

    method @FlaggedApi("com.android.internal.telephony.flags.enable_modem_cipher_transparency") @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setNullCipherNotificationsEnabled(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunisticNetworkState(boolean);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setPreferredNetworkTypeBitmask(long);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadio(boolean);

telephony/java/android/telephony/TelephonyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -18970,11 +18970,11 @@ public class TelephonyManager { 
    @FlaggedApi(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY)

    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)

    @SystemApi

    public void setEnableNullCipherNotifications(boolean enable) {

    public void setNullCipherNotificationsEnabled(boolean enable) {

        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {

                telephony.setEnableNullCipherNotifications(enable);

                telephony.setNullCipherNotificationsEnabled(enable);

            } else {

                throw new IllegalStateException("telephony service is null.");

            }

telephony/java/com/android/internal/telephony/ITelephony.aidl

+1 −1
Original line number Diff line number Diff line
@@ -3247,7 +3247,7 @@ interface ITelephony { 
     */

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission("

        + "android.Manifest.permission.MODIFY_PHONE_STATE)")

    void setEnableNullCipherNotifications(boolean enable);

    void setNullCipherNotificationsEnabled(boolean enable);



    /**

     * Get whether notifications are enabled for null cipher or integrity algorithms in use by the