From d8c30b9a80f8fea29d86ec28f43dc26dca5c5812 Mon Sep 17 00:00:00 2001
From: sqian <shuoq@google.com>
Date: Tue, 30 Oct 2018 16:58:20 -0700
Subject: [PATCH] Remove static for getSubscriptionIds

Bug: 118675557
Test: compile
Change-Id: Id2ba95331f87115daf6c0c074faccf812a1661c9
Merged-In: Id2ba95331f87115daf6c0c074faccf812a1661c9
(cherry picked from commit 705dec52553033c31750ec392445a5f6b5026964)
---
 api/current.txt                                           | 2 +-
 telephony/java/android/telephony/SubscriptionManager.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 3c014cbd6ee75..99df640d2a204 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -42840,7 +42840,7 @@ package android.telephony {
     method public static int getDefaultVoiceSubscriptionId();
     method public java.util.List<android.telephony.SubscriptionInfo> getOpportunisticSubscriptions(int);
     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 80ee9b393f4df..1f3dc8b6e43b1 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -1411,7 +1411,7 @@ public class SubscriptionManager {
      * @return subscription Ids or null if the given slot Index is not valid.
      */
     @Nullable
-    public static int[] getSubscriptionIds(int slotIndex) {
+    public int[] getSubscriptionIds(int slotIndex) {
         return getSubId(slotIndex);
     }