Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Omit inferred network policies from backup.

Browse Source 
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
This commit is contained in:
Jeff Sharkey
2018-02-24 19:09:20 -07:00
parent d0f517b9df
commit 55a3fe78c3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
View File

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