commit 8cc2a3b600be1b872aa8ebe28af74016f659341d
author Xiangyu/Malcolm Chen <refuhoo@google.com> Tue Nov 27 18:01:55 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 27 18:01:55 2018 +0000
tree ec4d80d4416404fe9834e64eadf2d37cc6cdb8c9
parent 710d926f3a1732cb589608abaaaad59d3a5bf406
parent affc2d130fc59ae4fa3cfc1c45200d2effae49cb

Merge "Clean up SubMgr#getOpportunisticSubscriptions."

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 e6c2444..013860b 100644
--- a/src/java/com/android/internal/telephony/SubscriptionController.java
+++ b/src/java/com/android/internal/telephony/SubscriptionController.java
@@ -2269,7 +2269,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 de195bc..02741de 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java
@@ -354,7 +354,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))
@@ -366,7 +366,7 @@
         verify(mTelephonyRegisteryMock, times(1))
                 .notifyOpportunisticSubscriptionInfoChanged();
         opptSubList = mSubscriptionControllerUT
-                .getOpportunisticSubscriptions(0, mCallingPackage);
+                .getOpportunisticSubscriptions(mCallingPackage);
         assertEquals(1, opptSubList.size());
         assertEquals("test2", opptSubList.get(0).getIccId());