Merge "Unexpose unnecessary SysUI APIs" am: 8c346470bd (9c1ab533) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −5

Original line number	Diff line number	Diff line
		@@ -44727,12 +44727,9 @@ package android.telephony {
		field public static final String EXTRA_SLOT_INDEX = "android.telephony.extra.SLOT_INDEX";
		field public static final String EXTRA_SUBSCRIPTION_INDEX = "android.telephony.extra.SUBSCRIPTION_INDEX";
		field public static final String IMSI_KEY_AVAILABILITY_INT = "imsi_key_availability_int";
		field public static final String KEY_5G_ICON_CONFIGURATION_STRING = "5g_icon_configuration_string";
		field public static final String KEY_5G_ICON_DISPLAY_GRACE_PERIOD_SEC_INT = "5g_icon_display_grace_period_sec_int";
		field public static final String KEY_5G_NR_SSRSRP_THRESHOLDS_INT_ARRAY = "5g_nr_ssrsrp_thresholds_int_array";
		field public static final String KEY_5G_NR_SSRSRQ_THRESHOLDS_INT_ARRAY = "5g_nr_ssrsrq_thresholds_int_array";
		field public static final String KEY_5G_NR_SSSINR_THRESHOLDS_INT_ARRAY = "5g_nr_sssinr_thresholds_int_array";
		field public static final String KEY_5G_WATCHDOG_TIME_MS_LONG = "5g_watchdog_time_long";
		field public static final String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";
		field public static final String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool";
		field public static final String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL = "allow_add_call_during_video_call";
		@@ -44925,7 +44922,6 @@ package android.telephony {
		field public static final String KEY_SHOW_APN_SETTING_CDMA_BOOL = "show_apn_setting_cdma_bool";
		field public static final String KEY_SHOW_BLOCKING_PAY_PHONE_OPTION_BOOL = "show_blocking_pay_phone_option_bool";
		field public static final String KEY_SHOW_CALL_BLOCKING_DISABLED_NOTIFICATION_ALWAYS_BOOL = "show_call_blocking_disabled_notification_always_bool";
		field public static final String KEY_SHOW_CARRIER_DATA_ICON_PATTERN_STRING = "show_carrier_data_icon_pattern_string";
		field public static final String KEY_SHOW_CDMA_CHOICES_BOOL = "show_cdma_choices_bool";
		field public static final String KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL = "show_iccid_in_sim_status_bool";
		field public static final String KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL = "show_ims_registration_status_bool";
		@@ -45350,7 +45346,6 @@ package android.telephony {
		method @NonNull public java.util.List<java.lang.Integer> getAvailableServices();
		method @Nullable public android.telephony.CellIdentity getCellIdentity();
		method public int getDomain();
		method public int getNrState();
		method @Nullable public String getRegisteredPlmn();
		method public int getTransportType();
		method public boolean isRegistered();

api/system-current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -8499,7 +8499,6 @@ package android.telephony {
		public final class DataSpecificRegistrationInfo implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public android.telephony.LteVopsSupportInfo getLteVopsSupportInfo();
		method public boolean isUsingCarrierAggregation();
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.DataSpecificRegistrationInfo> CREATOR;
		}
		@@ -8863,7 +8862,6 @@ package android.telephony {
		method @Nullable public android.telephony.NetworkRegistrationInfo getNetworkRegistrationInfo(int, int);
		method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForDomain(int);
		method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForTransportType(int);
		method public int getNrFrequencyRange();
		method @Nullable public String getOperatorAlphaLongRaw();
		method @Nullable public String getOperatorAlphaShortRaw();
		method @NonNull public static android.telephony.ServiceState newFromBundle(@NonNull android.os.Bundle);

telephony/java/android/telephony/CarrierConfigManager.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -1553,6 +1553,7 @@ public class CarrierConfigManager {
		/**
		* The string is used to compare with operator name.
		* If it matches the pattern then show specific data icon.
		* @hide
		*/
		public static final String KEY_SHOW_CARRIER_DATA_ICON_PATTERN_STRING =
		"show_carrier_data_icon_pattern_string";
		@@ -2967,9 +2968,9 @@ public class CarrierConfigManager {
		* UE wants to display 5G_Plus icon for scenario#1, and 5G icon for scenario#2; otherwise not
		* define.
		* The configuration is: "connected_mmwave:5G_Plus,connected:5G"
		* @hide
		*/
		public static final String KEY_5G_ICON_CONFIGURATION_STRING =
		"5g_icon_configuration_string";
		public static final String KEY_5G_ICON_CONFIGURATION_STRING = "5g_icon_configuration_string";

		/**
		* Timeout in seconds for displaying 5G icon, default value is 0 which means the timer is
		@@ -2981,12 +2982,14 @@ public class CarrierConfigManager {
		*
		* If 5G is reacquired during this timer, the timer is canceled and restarted when 5G is next
		* lost. Allows us to momentarily lose 5G without blinking the icon.
		* @hide
		*/
		public static final String KEY_5G_ICON_DISPLAY_GRACE_PERIOD_SEC_INT =
		"5g_icon_display_grace_period_sec_int";

		/**
		* Controls time in milliseconds until DcTracker reevaluates 5G connection state.
		* @hide
		*/
		public static final String KEY_5G_WATCHDOG_TIME_MS_LONG = "5g_watchdog_time_long";

telephony/java/android/telephony/DataSpecificRegistrationInfo.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -208,7 +208,6 @@ public final class DataSpecificRegistrationInfo implements Parcelable {
		* @return {@code true} if using carrier aggregation.
		* @hide
		*/
		@SystemApi
		public boolean isUsingCarrierAggregation() {
		return mIsUsingCarrierAggregation;
		}

telephony/java/android/telephony/NetworkRegistrationInfo.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -367,6 +367,7 @@ public final class NetworkRegistrationInfo implements Parcelable {
		* Get the 5G NR connection state.
		*
		* @return the 5G NR connection state.
		* @hide
		*/
		public @NRState int getNrState() {
		return mNrState;