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

Commit a92aa97a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove hidden IntDef in java doc."

parents 9edf4fee 938dc54b
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -2587,8 +2587,7 @@ public class SubscriptionManager {
     *              {@link NetworkCapabilities#NET_CAPABILITY_VALIDATED}.
     * @param executor The executor of where the callback will execute.
     * @param callback Callback will be triggered once it succeeds or failed.
     *                 See {@link TelephonyManager.SetOpportunisticSubscriptionResult}
     *                 for more details. Pass null if don't care about the result.
     *                 Pass null if don't care about the result.
     *
     * @hide
     *
@@ -2596,7 +2595,8 @@ public class SubscriptionManager {
    @SystemApi
    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
    public void setPreferredDataSubscriptionId(int subId, boolean needValidation,
            @Nullable @CallbackExecutor Executor executor, @Nullable  Consumer<Integer> callback) {
            @Nullable @CallbackExecutor Executor executor, @Nullable
            @TelephonyManager.SetOpportunisticSubscriptionResult Consumer<Integer> callback) {
        if (VDBG) logd("[setPreferredDataSubscriptionId]+ subId:" + subId);
        try {
            ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));