Merge "Make sure TelephonyBackupAgent backs up hidden subscription."
diff --git a/src/com/android/providers/telephony/TelephonyBackupAgent.java b/src/com/android/providers/telephony/TelephonyBackupAgent.java
index 5f6eb10..ad4367c 100644
--- a/src/com/android/providers/telephony/TelephonyBackupAgent.java
+++ b/src/com/android/providers/telephony/TelephonyBackupAgent.java
@@ -16,11 +16,6 @@
package com.android.providers.telephony;
-import com.google.android.mms.ContentType;
-import com.google.android.mms.pdu.CharacterSets;
-
-import com.android.internal.annotations.VisibleForTesting;
-
import android.annotation.TargetApi;
import android.app.AlarmManager;
import android.app.IntentService;
@@ -53,6 +48,11 @@
import android.util.Log;
import android.util.SparseArray;
+import com.android.internal.annotations.VisibleForTesting;
+
+import com.google.android.mms.ContentType;
+import com.google.android.mms.pdu.CharacterSets;
+
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileDescriptor;
@@ -319,7 +319,7 @@
final SubscriptionManager subscriptionManager = SubscriptionManager.from(this);
if (subscriptionManager != null) {
final List<SubscriptionInfo> subInfo =
- subscriptionManager.getActiveSubscriptionInfoList();
+ subscriptionManager.getActiveSubscriptionInfoList(/* userVisibleonly */false);
if (subInfo != null) {
for (SubscriptionInfo sub : subInfo) {
final String phoneNumber = getNormalizedNumber(sub);