Split setSystemSelectionChannels (0eea6259) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -11786,7 +11786,8 @@ package android.telephony {
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadioPower(boolean);		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadioPower(boolean);
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSimPowerState(int);		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSimPowerState(int);
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSimPowerStateForSlot(int, int);		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSimPowerStateForSlot(int, int);
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSystemSelectionChannels(@NonNull java.util.List<android.telephony.RadioAccessSpecifier>, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Boolean>);		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSystemSelectionChannels(@NonNull java.util.List<android.telephony.RadioAccessSpecifier>, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);
			method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSystemSelectionChannels(@NonNull java.util.List<android.telephony.RadioAccessSpecifier>);
	method @Deprecated public void setVisualVoicemailEnabled(android.telecom.PhoneAccountHandle, boolean);		method @Deprecated public void setVisualVoicemailEnabled(android.telecom.PhoneAccountHandle, boolean);
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoiceActivationState(int);		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoiceActivationState(int);
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void shutdownAllRadios();		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void shutdownAllRadios();

api/test-current.txt

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3775,7 +3775,8 @@ package android.telephony {
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile();		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile();
	method @Deprecated public void setCarrierTestOverride(String, String, String, String, String, String, String);		method @Deprecated public void setCarrierTestOverride(String, String, String, String, String, String, String);
	method public void setCarrierTestOverride(String, String, String, String, String, String, String, String, String);		method public void setCarrierTestOverride(String, String, String, String, String, String, String, String, String);
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSystemSelectionChannels(@NonNull java.util.List<android.telephony.RadioAccessSpecifier>, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Boolean>);		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSystemSelectionChannels(@NonNull java.util.List<android.telephony.RadioAccessSpecifier>, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);
			method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSystemSelectionChannels(@NonNull java.util.List<android.telephony.RadioAccessSpecifier>);
	method @RequiresPermission("android.permission.READ_ACTIVE_EMERGENCY_SESSION") public void updateTestOtaEmergencyNumberDbFilePath(@NonNull String);		method @RequiresPermission("android.permission.READ_ACTIVE_EMERGENCY_SESSION") public void updateTestOtaEmergencyNumberDbFilePath(@NonNull String);
	field public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; // 0xfffffffe		field public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; // 0xfffffffe
	field public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; // 0x1		field public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; // 0x1

telephony/java/android/telephony/TelephonyManager.java

+24 −6

Original line number	Original line	Diff line number	Diff line
	@@ -12610,14 +12610,32 @@ public class TelephonyManager {
	@TestApi		@TestApi
	@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
	public void setSystemSelectionChannels(@NonNull List<RadioAccessSpecifier> specifiers,		public void setSystemSelectionChannels(@NonNull List<RadioAccessSpecifier> specifiers,
	@Nullable @CallbackExecutor Executor executor,		@NonNull @CallbackExecutor Executor executor,
	@Nullable Consumer<Boolean> callback) {		@NonNull Consumer<Boolean> callback) {
			Objects.requireNonNull(specifiers, "Specifiers must not be null.");
			Objects.requireNonNull(executor, "Executor must not be null.");
			Objects.requireNonNull(callback, "Callback must not be null.");
			setSystemSelectionChannelsInternal(specifiers, executor, callback);
			}

			/**
			* Same as {@link #setSystemSelectionChannels(List, Executor, Consumer<Boolean>)}, but to be
			* used when the caller does not need feedback on the results of the operation.
			* @param specifiers which bands to scan.
			* @hide
			*/
			@SystemApi
			@TestApi
			@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
			public void setSystemSelectionChannels(@NonNull List<RadioAccessSpecifier> specifiers) {
	Objects.requireNonNull(specifiers, "Specifiers must not be null.");		Objects.requireNonNull(specifiers, "Specifiers must not be null.");
	if (callback != null) {		setSystemSelectionChannelsInternal(specifiers, null, null);
	Objects.requireNonNull(executor, "Executor must not be null when"
	+ " the callback is nonnull");
	}		}


			private void setSystemSelectionChannelsInternal(@NonNull List<RadioAccessSpecifier> specifiers,
			@Nullable @CallbackExecutor Executor executor,
			@Nullable Consumer<Boolean> callback) {
	IBooleanConsumer aidlConsumer = callback == null ? null : new IBooleanConsumer.Stub() {		IBooleanConsumer aidlConsumer = callback == null ? null : new IBooleanConsumer.Stub() {
	@Override		@Override
	public void accept(boolean result) {		public void accept(boolean result) {