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

Commit eaf47343 authored by Gil Cukierman's avatar Gil Cukierman Committed by Android (Google) Code Review
Browse files

Merge "api: Rename cipher transparency APIs for consistency" into main

parents e5b1f0d0 b500a172

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -14525,7 +14525,6 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void clearRadioPowerOffForReason(int);

    method public void dial(String);

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

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

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

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

    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void enableVideoCalling(boolean);
@@ -14598,7 +14597,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isAnyRadioPoweredOn();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isApnMetered(int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isApplicationOnUicc(int);

    method @FlaggedApi("com.android.internal.telephony.flags.enable_identifier_disclosure_transparency") @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isCellularIdentifierDisclosureNotificationEnabled();

    method @FlaggedApi("com.android.internal.telephony.flags.enable_identifier_disclosure_transparency") @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isCellularIdentifierDisclosureNotificationsEnabled();

    method public boolean isDataConnectivityPossible();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isEmergencyAssistanceEnabled();
@@ -14646,6 +14645,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataActivationState(int);

    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 @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);

telephony/java/android/telephony/TelephonyManager.java

+6 −6
Original line number Diff line number Diff line
@@ -18025,16 +18025,16 @@ public class TelephonyManager { 
    @FlaggedApi(Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY)

    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)

    @SystemApi

    public void enableCellularIdentifierDisclosureNotifications(boolean enable) {

    public void setEnableCellularIdentifierDisclosureNotifications(boolean enable) {

        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {

                telephony.enableCellularIdentifierDisclosureNotifications(enable);

                telephony.setEnableCellularIdentifierDisclosureNotifications(enable);

            } else {

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

            }

        } catch (RemoteException ex) {

            Rlog.e(TAG, "enableCellularIdentifierDisclosureNotifications RemoteException", ex);

            Rlog.e(TAG, "setEnableCellularIdentifierDisclosureNotifications RemoteException", ex);

            ex.rethrowFromSystemServer();

        }

    }
@@ -18051,16 +18051,16 @@ public class TelephonyManager { 
    @FlaggedApi(Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY)

    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    @SystemApi

    public boolean isCellularIdentifierDisclosureNotificationEnabled() {

    public boolean isCellularIdentifierDisclosureNotificationsEnabled() {

        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {

                return telephony.isCellularIdentifierDisclosureNotificationEnabled();

                return telephony.isCellularIdentifierDisclosureNotificationsEnabled();

            } else {

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

            }

        } catch (RemoteException ex) {

            Rlog.e(TAG, "isCellularIdentifierDisclosureNotificationEnabled RemoteException", ex);

            Rlog.e(TAG, "isCellularIdentifierDisclosureNotificationsEnabled RemoteException", ex);

            ex.rethrowFromSystemServer();

        }

        return false;

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

+2 −2
Original line number Diff line number Diff line
@@ -3182,7 +3182,7 @@ interface ITelephony { 
     */

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

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

    void enableCellularIdentifierDisclosureNotifications(boolean enable);

    void setEnableCellularIdentifierDisclosureNotifications(boolean enable);



    /**

     * Get whether or not cellular identifier disclosure notifications are enabled.
@@ -3196,5 +3196,5 @@ interface ITelephony { 
     */

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

        + "android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)")

    boolean isCellularIdentifierDisclosureNotificationEnabled();

    boolean isCellularIdentifierDisclosureNotificationsEnabled();

}