Merge "Remove static for getSubscriptionIds" am: 9a9dbf05e0

am: 0be2ef9746

Change-Id: I05f6d006c949cce7a4604390ec2a4cb170b5ffa5

2 files changed, 2 insertions, 2 deletions

diff --git a/api/current.txt b/api/current.txt
index caa14d4f6713..8079daadc887 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -42844,7 +42844,7 @@ package android.telephony {
     method public static int getDefaultVoiceSubscriptionId();
     method public java.util.List<android.telephony.SubscriptionInfo> getOpportunisticSubscriptions();
     method public static int getSlotIndex(int);
-    method public static int[] getSubscriptionIds(int);
+    method public int[] getSubscriptionIds(int);
     method public java.util.List<android.telephony.SubscriptionPlan> getSubscriptionPlans(int);
     method public boolean isActiveSubscriptionId(int);
     method public boolean isNetworkRoaming(int);
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index f8ada9b3a624..6fbc25d0de8a 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -1426,7 +1426,7 @@ public class SubscriptionManager {
      * subscriptions in the slot.
      */
     @Nullable
-    public static int[] getSubscriptionIds(int slotIndex) {
+    public int[] getSubscriptionIds(int slotIndex) {
         return getSubId(slotIndex);
     }