commit bd58b599b90ee39aa199341b4f31612fae2588a5
author Sooraj Sasindran <sasindran@google.com> Mon Jan 06 19:08:26 2020 -0800
committer Sooraj Sasindran <sasindran@google.com> Tue Mar 10 20:10:30 2020 +0000
tree 4d7acc999204d658f9dffd8ee0c3574a28f7359d
parent 0b8113aca1b782d1f3c15f8acd175dc9aef837af

change getActiveAndHiddenSubscriptionInfoList API name

getActiveAndHiddenSubscriptionInfoList to getCompleteActiveSubscriptionInfoList

Bug: 144791721
Test: make
Merged-In: Id22fcc775dd348949cdc52fd6971db3d7be81a31
Change-Id: Id22fcc775dd348949cdc52fd6971db3d7be81a31
(cherry picked from commit fdb624fd7717b0ae1a858b20a76b9d8ac565b259)

src/com/android/providers/telephony/CarrierIdProvider.java

diff --git a/src/com/android/providers/telephony/CarrierIdProvider.java b/src/com/android/providers/telephony/CarrierIdProvider.java
index 122c304..a3c299f 100644
--- a/src/com/android/providers/telephony/CarrierIdProvider.java
+++ b/src/com/android/providers/telephony/CarrierIdProvider.java
@@ -614,7 +614,7 @@
             // Remove absent subId from the currentSubscriptionMap.
             List activeSubscriptions = new ArrayList<>();
             final List<SubscriptionInfo> subscriptionInfoList =
-                sm.getActiveAndHiddenSubscriptionInfoList();
+                sm.getCompleteActiveSubscriptionInfoList();
             if (subscriptionInfoList != null) {
                 for (SubscriptionInfo subInfo : subscriptionInfoList) {
                     activeSubscriptions.add(subInfo.getSubscriptionId());

src/com/android/providers/telephony/TelephonyBackupAgent.java

diff --git a/src/com/android/providers/telephony/TelephonyBackupAgent.java b/src/com/android/providers/telephony/TelephonyBackupAgent.java
index 3d32bef..58e3388 100644
--- a/src/com/android/providers/telephony/TelephonyBackupAgent.java
+++ b/src/com/android/providers/telephony/TelephonyBackupAgent.java
@@ -320,7 +320,7 @@
         final SubscriptionManager subscriptionManager = SubscriptionManager.from(this);
         if (subscriptionManager != null) {
             final List<SubscriptionInfo> subInfo =
-                    subscriptionManager.getActiveAndHiddenSubscriptionInfoList();
+                    subscriptionManager.getCompleteActiveSubscriptionInfoList();
             if (subInfo != null) {
                 for (SubscriptionInfo sub : subInfo) {
                     final String phoneNumber = getNormalizedNumber(sub);