Merge "Remove refererence from public API to flagged API" into main (785b7ec6) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -9892,7 +9892,6 @@ public class CarrierConfigManager {
		*
		* @see TelephonyManager#PURCHASE_PREMIUM_CAPABILITY_RESULT_USER_CANCELED
		* @see TelephonyManager#PURCHASE_PREMIUM_CAPABILITY_RESULT_TIMEOUT
		* @see TelephonyManager#PURCHASE_PREMIUM_CAPABILITY_RESULT_USER_DISABLED
		*/
		public static final String
		KEY_PREMIUM_CAPABILITY_NOTIFICATION_BACKOFF_HYSTERESIS_TIME_MILLIS_LONG =

+0 −10

Original line number	Diff line number	Diff line
		@@ -109,10 +109,6 @@ import java.util.stream.Collectors;
		* Then for SDK 35+, if the caller identity is personal profile, then
		* {@link #getActiveSubscriptionInfoList} will return subscription 1 only and vice versa.
		*
		* <p>If the caller needs to see all subscriptions across user profiles,
		* use {@link #createForAllUserProfiles} to convert the instance to see all. Additional permission
		* may be required as documented on the each API.
		*
		*/
		@SystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE)
		@RequiresFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)
		@@ -1815,9 +1811,6 @@ public class SubscriptionManager {
		* Then for SDK 35+, if the caller identity is personal profile, then this will return
		* subscription 1 only and vice versa.
		*
		* <p>If the caller needs to see all subscriptions across user profiles,
		* use {@link #createForAllUserProfiles} to convert this instance to see all.
		*
		* <p> The records will be sorted by {@link SubscriptionInfo#getSimSlotIndex} then by
		* {@link SubscriptionInfo#getSubscriptionId}.
		*
		@@ -2085,9 +2078,6 @@ public class SubscriptionManager {
		* Android SDK 35(V) and above, while Android SDK 34(U) and below can see all subscriptions as
		* it does today.
		*
		* <p>If the caller needs to see all subscriptions across user profiles,
		* use {@link #createForAllUserProfiles} to convert this instance to see all.
		*
		* @return The current number of active subscriptions.
		*
		* @see #getActiveSubscriptionInfoList()