Merge "Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType" am: b332627a15 (6035378f) · Commits · e / os / android_frameworks_base

core/api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -39099,6 +39099,9 @@ package android.telephony {
		method public static boolean isConfigForIdentifiedCarrier(android.os.PersistableBundle);
		method public void notifyConfigChangedForSubId(int);
		field public static final String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";
		field public static final int CARRIER_NR_AVAILABILITY_NONE = 0; // 0x0
		field public static final int CARRIER_NR_AVAILABILITY_NSA = 1; // 0x1
		field public static final int CARRIER_NR_AVAILABILITY_SA = 2; // 0x2
		field public static final int DATA_CYCLE_THRESHOLD_DISABLED = -2; // 0xfffffffe
		field public static final int DATA_CYCLE_USE_PLATFORM_DEFAULT = -1; // 0xffffffff
		field public static final String ENABLE_EAP_METHOD_PREFIX_BOOL = "enable_eap_method_prefix_bool";
		@@ -39157,6 +39160,7 @@ package android.telephony {
		field public static final String KEY_CARRIER_INSTANT_LETTERING_LENGTH_LIMIT_INT = "carrier_instant_lettering_length_limit_int";
		field public static final String KEY_CARRIER_NAME_OVERRIDE_BOOL = "carrier_name_override_bool";
		field public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string";
		field public static final String KEY_CARRIER_NR_AVAILABILITY_INT = "carrier_nr_availability_int";
		field public static final String KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL = "carrier_rcs_provisioning_required_bool";
		field public static final String KEY_CARRIER_SETTINGS_ACTIVITY_COMPONENT_NAME_STRING = "carrier_settings_activity_component_name_string";
		field public static final String KEY_CARRIER_SETTINGS_ENABLE_BOOL = "carrier_settings_enable_bool";

core/api/system-current.txt

+15 −4

Original line number	Diff line number	Diff line
		@@ -9638,6 +9638,7 @@ package android.telephony {
		method public void onSrvccStateChanged(int);
		method public void onVoiceActivationStateChanged(int);
		field @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public static final int EVENT_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGED = 23; // 0x17
		field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final int EVENT_ALLOWED_NETWORK_TYPE_LIST_CHANGED = 35; // 0x23
		field @RequiresPermission("android.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH") public static final int EVENT_ALWAYS_REPORTED_SIGNAL_STRENGTH_CHANGED = 10; // 0xa
		field @RequiresPermission(allOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public static final int EVENT_BARRING_INFO_CHANGED = 32; // 0x20
		field @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int EVENT_CALL_ATTRIBUTES_CHANGED = 27; // 0x1b
		@@ -9680,6 +9681,10 @@ package android.telephony {
		field @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final int LISTEN_VOICE_ACTIVATION_STATE = 131072; // 0x20000
		}

		public static interface PhoneStateListener.AllowedNetworkTypesChangedListener {
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void onAllowedNetworkTypesChanged(@NonNull java.util.Map<java.lang.Integer,java.lang.Long>);
		}

		public static interface PhoneStateListener.CallAttributesChangedListener {
		method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onCallAttributesChanged(@NonNull android.telephony.CallAttributes);
		}
		@@ -10082,7 +10087,9 @@ package android.telephony {
		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void enableVideoCalling(boolean);
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getAidForAppType(int);
		method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<android.service.carrier.CarrierIdentifier> getAllowedCarriers(int);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getAllowedNetworkTypes();
		method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getAllowedNetworkTypes();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getAllowedNetworkTypesBitmask();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getAllowedNetworkTypesForReason(int);
		method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public android.content.ComponentName getAndUpdateDefaultRespondViaMessageApplication();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getCallForwarding(int, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CallForwardingInfoCallback);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getCallWaitingStatus(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		@@ -10116,7 +10123,7 @@ package android.telephony {
		method public int getMaxNumberOfSimultaneouslyActiveSims();
		method public static long getMaxNumberVerificationTimeoutMillis();
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String[] getMergedImsisFromGroup();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getPreferredNetworkTypeBitmask();
		method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getPreferredNetworkTypeBitmask();
		method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public int getRadioPowerState();
		method public int getSimApplicationState();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getSimApplicationState(int);
		@@ -10171,7 +10178,8 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void resetSettings();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int sendThermalMitigationRequest(@NonNull android.telephony.ThermalMitigationRequest);
		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setAllowedCarriers(int, java.util.List<android.service.carrier.CarrierIdentifier>);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAllowedNetworkTypes(long);
		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAllowedNetworkTypes(long);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setAllowedNetworkTypesForReason(int, long);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCallForwarding(@NonNull android.telephony.CallForwardingInfo, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCallWaitingEnabled(boolean, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>);
		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCarrierDataEnabled(boolean);
		@@ -10186,7 +10194,7 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultiSimCarrierRestriction(boolean);
		method public int setNrDualConnectivityState(int);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunisticNetworkState(boolean);
		method @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 @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadio(boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setRadioEnabled(boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadioPower(boolean);
		@@ -10220,6 +10228,9 @@ package android.telephony {
		field public static final String ACTION_SIM_APPLICATION_STATE_CHANGED = "android.telephony.action.SIM_APPLICATION_STATE_CHANGED";
		field public static final String ACTION_SIM_CARD_STATE_CHANGED = "android.telephony.action.SIM_CARD_STATE_CHANGED";
		field public static final String ACTION_SIM_SLOT_STATUS_CHANGED = "android.telephony.action.SIM_SLOT_STATUS_CHANGED";
		field public static final int ALLOWED_NETWORK_TYPES_REASON_CARRIER = 2; // 0x2
		field public static final int ALLOWED_NETWORK_TYPES_REASON_POWER = 1; // 0x1
		field public static final int ALLOWED_NETWORK_TYPES_REASON_USER = 0; // 0x0
		field public static final int CALL_WAITING_STATUS_DISABLED = 2; // 0x2
		field public static final int CALL_WAITING_STATUS_ENABLED = 1; // 0x1
		field public static final int CALL_WAITING_STATUS_NOT_SUPPORTED = 4; // 0x4

core/java/android/provider/Telephony.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -5279,6 +5279,19 @@ public final class Telephony {
		*/
		public static final String COLUMN_ALLOWED_NETWORK_TYPES = "allowed_network_types";

		/**
		* TelephonyProvider column name for allowed network types with all of reasons. Indicate
		* which network types are allowed for
		* {@link TelephonyManager#ALLOWED_NETWORK_TYPES_REASON_USER},
		* {@link TelephonyManager#ALLOWED_NETWORK_TYPES_REASON_POWER},
		* {@link TelephonyManager#ALLOWED_NETWORK_TYPES_REASON_CARRIER}.
		* <P>Type: TEXT </P>
		*
		* @hide
		*/
		public static final String COLUMN_ALLOWED_NETWORK_TYPES_FOR_REASONS =
		"allowed_network_types_for_reasons";

		/**
		* TelephonyProvider column name for RCS configuration.
		* <p>TYPE: BLOB

core/java/android/telephony/PhoneStateListener.java

+60 −1

Original line number	Diff line number	Diff line
		@@ -1020,6 +1020,19 @@ public class PhoneStateListener {
		@RequiresPermission(Manifest.permission.READ_PRECISE_PHONE_STATE)
		public static final int EVENT_DATA_ENABLED_CHANGED = 34;

		/**
		* Event for changes to allowed network list based on all active subscriptions.
		*
		* <p>Requires permission {@link android.Manifest.permission#READ_PHONE_STATE} or the calling
		* app has carrier privileges (see {@link TelephonyManager#hasCarrierPrivileges}).
		*
		* @hide
		* @see AllowedNetworkTypesChangedListener#onAllowedNetworkTypesChanged
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		public static final int EVENT_ALLOWED_NETWORK_TYPE_LIST_CHANGED = 35;

		/** @hide */
		@IntDef(prefix = { "EVENT_" }, value = {
		EVENT_SERVICE_STATE_CHANGED,
		@@ -1055,7 +1068,8 @@ public class PhoneStateListener {
		EVENT_REGISTRATION_FAILURE,
		EVENT_BARRING_INFO_CHANGED,
		EVENT_PHYSICAL_CHANNEL_CONFIG_CHANGED,
		EVENT_DATA_ENABLED_CHANGED
		EVENT_DATA_ENABLED_CHANGED,
		EVENT_ALLOWED_NETWORK_TYPE_LIST_CHANGED
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface TelephonyEvent {}
		@@ -1802,6 +1816,41 @@ public class PhoneStateListener {
		int causeCode, int additionalCauseCode);
		}

		/**
		* Interface for the current allowed network type list listener. This list involves values of
		* allowed network type for each of reasons.
		*
		* @hide
		*/
		@SystemApi
		public interface AllowedNetworkTypesChangedListener {
		/**
		* Callback invoked when the current allowed network type list has changed on the
		* registered subscription.
		* Note, the registered subscription is associated with {@link TelephonyManager} object
		* on which
		* {@link TelephonyManager#registerPhoneStateListener(Executor, PhoneStateListener)}
		* was called.
		* If this TelephonyManager object was created with
		* {@link TelephonyManager#createForSubscriptionId(int)}, then the callback applies to the
		* given subscription ID. Otherwise, this callback applies to
		* {@link SubscriptionManager#getDefaultSubscriptionId()}.
		*
		* @param allowedNetworkTypesList Map associating all allowed network type reasons
		* ({@link TelephonyManager#ALLOWED_NETWORK_TYPES_REASON_USER},
		* {@link TelephonyManager#ALLOWED_NETWORK_TYPES_REASON_POWER}, and
		* {@link TelephonyManager#ALLOWED_NETWORK_TYPES_REASON_CARRIER}) with reason's allowed
		* network type values.
		* For example:
		* map{{TelephonyManager#ALLOWED_NETWORK_TYPES_REASON_USER, long type value},
		* {TelephonyManager#ALLOWED_NETWORK_TYPES_REASON_POWER, long type value},
		* {TelephonyManager#ALLOWED_NETWORK_TYPES_REASON_CARRIER, long type value}}
		*/
		@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		void onAllowedNetworkTypesChanged(
		@NonNull Map<Integer, Long> allowedNetworkTypesList);
		}

		/**
		* Interface for call attributes listener.
		*
		@@ -2811,6 +2860,16 @@ public class PhoneStateListener {
		() -> mExecutor.execute(() -> listener.onDataEnabledChanged(
		enabled, reason)));
		}

		public void onAllowedNetworkTypesChanged(Map allowedNetworkTypesList) {
		AllowedNetworkTypesChangedListener listener =
		(AllowedNetworkTypesChangedListener) mPhoneStateListenerWeakRef.get();
		if (listener == null) return;

		Binder.withCleanCallingIdentity(
		() -> mExecutor.execute(
		() -> listener.onAllowedNetworkTypesChanged(allowedNetworkTypesList)));
		}
		}

		private void log(String s) {

core/java/android/telephony/TelephonyRegistryManager.java

+20 −3

Original line number	Diff line number	Diff line
		@@ -25,9 +25,6 @@ import android.compat.annotation.EnabledAfter;
		import android.content.Context;
		import android.os.Binder;
		import android.os.Build;
		import android.os.Handler;
		import android.os.HandlerExecutor;
		import android.os.Looper;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.telephony.Annotation.CallState;
		@@ -802,6 +799,22 @@ public class TelephonyRegistryManager {
		}
		}

		/**
		* Notify emergency number list changed on certain subscription.
		*
		* @param subId for which emergency number list changed.
		* @param slotIndex for which emergency number list changed. Can be derived from subId except
		* when subId is invalid.
		*/
		public void notifyAllowedNetworkTypesChanged(int subId, int slotIndex,
		Map<Integer, Long> allowedNetworkTypeList) {
		try {
		sRegistry.notifyAllowedNetworkTypesChanged(slotIndex, subId, allowedNetworkTypeList);
		} catch (RemoteException ex) {
		// system process is dead
		}
		}

		public @NonNull Set<Integer> getEventsFromListener(@NonNull PhoneStateListener listener) {

		Set<Integer> eventList = new ArraySet<>();
		@@ -930,6 +943,10 @@ public class TelephonyRegistryManager {
		eventList.add(PhoneStateListener.EVENT_DATA_ENABLED_CHANGED);
		}

		if (listener instanceof PhoneStateListener.AllowedNetworkTypesChangedListener) {
		eventList.add(PhoneStateListener.EVENT_ALLOWED_NETWORK_TYPE_LIST_CHANGED);
		}

		return eventList;
		}