Merge "Add getPhoneCapability function in TelephonyManager" (816ef2dd) · Commits · e / os / android_frameworks_base

core/api/current.txt

+0 −10

Original line number	Diff line number	Diff line
		@@ -41215,12 +41215,6 @@ package android.telephony {
		field public static final int SCAN_TYPE_PERIODIC = 1; // 0x1
		}

		public final class PhoneCapability implements android.os.Parcelable {
		method public int describeContents();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.PhoneCapability> CREATOR;
		}

		public class PhoneNumberFormattingTextWatcher implements android.text.TextWatcher {
		ctor public PhoneNumberFormattingTextWatcher();
		ctor public PhoneNumberFormattingTextWatcher(String);
		@@ -41397,10 +41391,6 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public void onMessageWaitingIndicatorChanged(boolean);
		}

		public static interface PhoneStateListener.PhoneCapabilityChangedListener {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void onPhoneCapabilityChanged(@NonNull android.telephony.PhoneCapability);
		}

		public static interface PhoneStateListener.PreciseDataConnectionStateChangedListener {
		method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onPreciseDataConnectionStateChanged(@NonNull android.telephony.PreciseDataConnectionState);
		}

core/api/system-current.txt

+17 −0

Original line number	Diff line number	Diff line
		@@ -10983,6 +10983,18 @@ package android.telephony {
		field public static final int REASON_UNSPECIFIED = 0; // 0x0
		}

		public final class PhoneCapability implements android.os.Parcelable {
		method public int describeContents();
		method public int getDeviceNrCapabilityBitmask();
		method @IntRange(from=1) public int getMaxActiveInternetData();
		method @IntRange(from=1) public int getMaxActivePacketSwitchedVoiceCalls();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.PhoneCapability> CREATOR;
		field public static final int DEVICE_NR_CAPABILITY_NONE = 0; // 0x0
		field public static final int DEVICE_NR_CAPABILITY_NSA = 1; // 0x1
		field public static final int DEVICE_NR_CAPABILITY_SA = 2; // 0x2
		}

		public final class PhoneNumberRange implements android.os.Parcelable {
		ctor public PhoneNumberRange(@NonNull String, @NonNull String, @NonNull String, @NonNull String);
		method public int describeContents();
		@@ -11071,6 +11083,10 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void onOutgoingEmergencySms(@NonNull android.telephony.emergency.EmergencyNumber, int);
		}

		public static interface PhoneStateListener.PhoneCapabilityChangedListener {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void onPhoneCapabilityChanged(@NonNull android.telephony.PhoneCapability);
		}

		public static interface PhoneStateListener.PhysicalChannelConfigChangedListener {
		method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onPhysicalChannelConfigChanged(@NonNull java.util.List<android.telephony.PhysicalChannelConfig>);
		}
		@@ -11495,6 +11511,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 @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.PhoneCapability getPhoneCapability();
		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();

core/java/android/telephony/PhoneStateListener.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1698,8 +1698,9 @@ public class PhoneStateListener {

		/**
		* Interface for phone capability listener.
		*
		* @hide
		*/
		@SystemApi
		public interface PhoneCapabilityChangedListener {
		/**
		* Callback invoked when phone capability changes.

core/res/res/values/config.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -4637,4 +4637,9 @@
		dreaming. This allows the AoD to rotate on devices without a wake device_orientation
		sensor. Note that this flag should only be enabled for development/testing use. -->
		<bool name="config_forceOrientationListenerEnabledWhileDreaming">false</bool>

		<!-- Whether the device enable the standalone (SA) mode of 5G NR.-->
		<bool name="config_telephony5gStandalone">false</bool>
		<!-- Whether the device enable the non-standalone (NSA) mode of 5G NR.-->
		<bool name="config_telephony5gNonStandalone">false</bool>
		</resources>

core/res/res/values/symbols.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -4160,4 +4160,7 @@
		<java-symbol type="string" name="sensor_privacy_start_use_camera_notification_content" />
		<java-symbol type="string" name="sensor_privacy_start_use_dialog_turn_on_button" />
		<java-symbol type="string" name="sensor_privacy_notification_channel_label" />

		<java-symbol type="bool" name="config_telephony5gStandalone" />
		<java-symbol type="bool" name="config_telephony5gNonStandalone" />
		</resources>