summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-04-01 18:23:27 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-04-01 18:23:27 +0000
commita92aa97a1fb4b45d69defb67b3c6fbead15584b2 (patch)
tree9d99f53a4b66780923b2ac46ad77d1eb07eacd42
parent9edf4feecf073e7311a5fc64ffed1c008591cbb3 (diff)
parent938dc54b57315afd7e8eead65de0bacd60c914c0 (diff)
Merge "Remove hidden IntDef in java doc."
-rw-r--r--telephony/java/android/telephony/SubscriptionManager.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index 14eac87f1575..a933da753c41 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -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"));