summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2018-10-22 21:12:56 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-10-22 21:12:56 +0000
commitceceb459e09bc0f51ef3722e30df4e1940bbe83c (patch)
tree1d44d8857ef85724a47e52f922f4a4d1df0aabb3
parent36afe11a64dc8e73923aada21dc53c1df97c1378 (diff)
parentf8ace214fba6ce8f20c7b7b2ec8e48fb3e345ced (diff)
Merge "Add @Nullable for getSubscriptionIds"
-rw-r--r--telephony/java/android/telephony/SubscriptionManager.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index 97b7414750c9..a0b020dc16d1 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -1340,6 +1340,7 @@ public class SubscriptionManager {
* @param slotIndex the slot Index.
* @return subscription Ids or null if the given slot Index is not valid.
*/
+ @Nullable
public static int[] getSubscriptionIds(int slotIndex) {
return getSubId(slotIndex);
}