commit affc2d130fc59ae4fa3cfc1c45200d2effae49cb
author Malcolm Chen <refuhoo@google.com> Tue Oct 23 18:46:05 2018 -0700
committer Malcolm Chen <refuhoo@google.com> Tue Nov 06 16:57:49 2018 -0800
tree 70f06ee9cfa6d035e1c051a3eda4aca44d0f445b
parent 18eb155d7289ccf1cd05d3db287d2d23eb3fb12e

Clean up SubMgr#getOpportunisticSubscriptions.

Remove param slotIndex, which is not used.

Bug: 117832560
Bug: 117830188
Test: build
Change-Id: Iac892044d336542b103eca2908420d8fd16e59c8
Merged-In: Iac892044d336542b103eca2908420d8fd16e59c8

src/java/com/android/internal/telephony/SubscriptionController.java

diff --git a/src/java/com/android/internal/telephony/SubscriptionController.java b/src/java/com/android/internal/telephony/SubscriptionController.java
index 9e518f7..05c95c6 100644
--- a/src/java/com/android/internal/telephony/SubscriptionController.java
+++ b/src/java/com/android/internal/telephony/SubscriptionController.java
@@ -2322,7 +2322,7 @@
     }
 
     @Override
-    public List<SubscriptionInfo> getOpportunisticSubscriptions(int slotId, String callingPackage) {
+    public List<SubscriptionInfo> getOpportunisticSubscriptions(String callingPackage) {
         return getSubscriptionInfoListFromCacheHelper(
                 callingPackage, mCacheOpportunisticSubInfoList);
     }

tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java

diff --git a/tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java b/tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java
index 489a19f..3f9c84b 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java
@@ -348,7 +348,7 @@
         // Neither sub1 or sub2 are opportunistic. So getOpportunisticSubscriptions
         // should return empty list and no callback triggered.
         List<SubscriptionInfo> opptSubList = mSubscriptionControllerUT
-                .getOpportunisticSubscriptions(0, mCallingPackage);
+                .getOpportunisticSubscriptions(mCallingPackage);
 
         assertTrue(opptSubList.isEmpty());
         verify(mTelephonyRegisteryMock, times(0))
@@ -360,7 +360,7 @@
         verify(mTelephonyRegisteryMock, times(1))
                 .notifyOpportunisticSubscriptionInfoChanged();
         opptSubList = mSubscriptionControllerUT
-                .getOpportunisticSubscriptions(0, mCallingPackage);
+                .getOpportunisticSubscriptions(mCallingPackage);
         assertEquals(1, opptSubList.size());
         assertEquals("test2", opptSubList.get(0).getIccId());