commit 6753264e5050abbdd9749bce2d4b3579b1278b63
author Malcolm Chen <refuhoo@google.com> Tue Feb 12 19:21:58 2019 -0800
committer Malcolm Chen <refuhoo@google.com> Tue Mar 12 13:43:33 2019 -0700
tree bf2bca9f9be6bb1e1ba7620b0ba26a7a53ad0085
parent 05f73f5a45558719c07f358d5ec3f4a6f097ddca

Make sure TelephonyBackupAgent backs up hidden subscription.

Bug: 121396526
Test: manual
Change-Id: I3aff34101b6d2f45cdd074c6b1b908930897b0cb
Merged-In: I3aff34101b6d2f45cdd074c6b1b908930897b0cb

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 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);