From 55a3fe78c3f642c873193c4fd1cf2fcc1849ea55 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Sat, 24 Feb 2018 19:09:20 -0700 Subject: [PATCH] Omit inferred network policies from backup. Inferred network policies might include carrier-protected data that we can't export per CDD. We continue to backup policies that have been explicitly set by the end user. Test: builds, boots Bug: 24786071 Change-Id: I9de3308dfde72435627e8042fee4bcbb480e92dc --- .../com/android/providers/settings/SettingsBackupAgent.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java index dd89df1b5b157..2b181dcfd25e7 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java @@ -858,7 +858,10 @@ public class SettingsBackupAgent extends BackupAgentHelper { out.writeInt(NETWORK_POLICIES_BACKUP_VERSION); out.writeInt(policies.length); for (NetworkPolicy policy : policies) { - if (policy != null) { + // We purposefully only backup policies that the user has + // defined; any inferred policies might include + // carrier-protected data that we can't export. + if (policy != null && !policy.inferred) { byte[] marshaledPolicy = policy.getBytesForBackup(); out.writeByte(BackupUtils.NOT_NULL); out.writeInt(marshaledPolicy.length);