Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e539ac8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove workprofile related javadoc from public API" into main

parents 8c359bde 3489107a
Loading
Loading
Loading
Loading
+3 −26
Original line number Diff line number Diff line
@@ -99,18 +99,7 @@ import java.util.function.Consumer;
import java.util.stream.Collectors;

/**
 * Subscription manager provides the mobile subscription information that are associated with the
 * calling user profile {@link UserHandle} for Android SDK 35(V) and above, while Android SDK 34(U)
 * and below can see all subscriptions as it does today.
 *
 * <p>For example, if we have
 * <ul>
 *     <li> Subscription 1 associated with personal profile.
 *     <li> Subscription 2 associated with work profile.
 * </ul>
 * Then for SDK 35+, if the caller identity is personal profile, then
 * {@link #getActiveSubscriptionInfoList} will return subscription 1 only and vice versa.
 *
 * Subscription manager provides the mobile subscription information.
 */
@SystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE)
@RequiresFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)
@@ -1980,17 +1969,7 @@ public class SubscriptionManager {
    }

    /**
     * Get the SubscriptionInfo(s) of the currently active SIM(s) associated with the current caller
     * user profile {@link UserHandle} for Android SDK 35(V) and above, while Android SDK 34(U)
     * and below can see all subscriptions as it does today.
     *
     * <p>For example, if we have
     * <ul>
     *     <li> Subscription 1 associated with personal profile.
     *     <li> Subscription 2 associated with work profile.
     * </ul>
     * Then for SDK 35+, if the caller identity is personal profile, then this will return
     * subscription 1 only and vice versa.
     * Get the SubscriptionInfo(s) of the currently active SIM(s).
     *
     * <p> Returned records will be sorted by {@link SubscriptionInfo#getSimSlotIndex} then by
     * {@link SubscriptionInfo#getSubscriptionId}. Beginning with Android SDK 35, this method will
@@ -2259,9 +2238,7 @@ public class SubscriptionManager {
    }

    /**
     * Get the active subscription count associated with the current caller user profile for
     * Android SDK 35(V) and above, while Android SDK 34(U) and below can see all subscriptions as
     * it does today.
     * Get the active subscription count.
     *
     * @return The current number of active subscriptions.
     *