Snap for 6286840 from bd58b599b90ee39aa199341b4f31612fae2588a5 to rvc-release
Change-Id: Idd6f0ca8d4d16a9d49900db4843320015fb5b1cb
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());
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);