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

Commit 969acb19 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Update getSubscriptionPlans documentation" am: f3ecc618 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2032283

Change-Id: I3dfa5acb184a9c8eb15009b8d19c977a2f62cddd
parents b625f5a1 f3ecc618

core/java/android/net/NetworkPolicyManager.java

+4 −2
Original line number Diff line number Diff line
@@ -525,9 +525,11 @@ public class NetworkPolicyManager { 
     *

     * @param subId the subscriber to get the subscription plans for.

     * @param callingPackage the name of the package making the call.

     * @return the active {@link SubscriptionPlan}s for the given subscription id, or

     *         {@code null} if not found.

     * @hide

     */

    @NonNull

    @Nullable

    public SubscriptionPlan[] getSubscriptionPlans(int subId, @NonNull String callingPackage) {

        try {

            return mService.getSubscriptionPlans(subId, callingPackage);
@@ -540,7 +542,7 @@ public class NetworkPolicyManager { 
     * Get subscription plan for the given networkTemplate.

     *

     * @param template the networkTemplate to get the subscription plan for.

     * @return the active {@link SubscriptionPlan} for the given template, or

     * @return the active {@link SubscriptionPlan}s for the given template, or

     *         {@code null} if not found.

     * @hide

     */