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

Commit 10880b32 authored Jan 24, 2024 by Michael Groover

Update null cipher notification mutator API naming to match accessor

This commit updates the mutator API name to
setNullCipherNotificationsEnabled to maintain consistency with the
accessor API isNullCipherNotificationsEnabled.

Bug: 321949243
Test: atest TelephonyManagerTest
Change-Id: Id267e6cce87d6533b3128a94c0747f9c2b0667a6

parent 5ca74cb3

core/api/system-current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14802,11 +14802,11 @@ package android.telephony {
	method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);		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 @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_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 @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 setMobileDataPolicyEnabled(int, boolean);
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultiSimCarrierRestriction(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 @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 @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 setPreferredNetworkTypeBitmask(long);
	method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadio(boolean);		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadio(boolean);

telephony/java/android/telephony/TelephonyManager.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -18926,11 +18926,11 @@ public class TelephonyManager {
	@FlaggedApi(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY)		@FlaggedApi(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY)
	@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)		@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
	@SystemApi		@SystemApi
	public void setEnableNullCipherNotifications(boolean enable) {		public void setNullCipherNotificationsEnabled(boolean enable) {
	try {		try {
	ITelephony telephony = getITelephony();		ITelephony telephony = getITelephony();
	if (telephony != null) {		if (telephony != null) {
	telephony.setEnableNullCipherNotifications(enable);		telephony.setNullCipherNotificationsEnabled(enable);
	} else {		} else {
	throw new IllegalStateException("telephony service is null.");		throw new IllegalStateException("telephony service is null.");
	}		}

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3253,7 +3253,7 @@ interface ITelephony {
	*/		*/
	@JavaPassthrough(annotation="@android.annotation.RequiresPermission("		@JavaPassthrough(annotation="@android.annotation.RequiresPermission("
	+ "android.Manifest.permission.MODIFY_PHONE_STATE)")		+ "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		* Get whether notifications are enabled for null cipher or integrity algorithms in use by the