Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39690fe4 authored by Annie Meng's avatar Annie Meng Committed by Android (Google) Code Review
Browse files

Merge "Validate restore of NetworkPolicy settings"

parents a0fdcc97 853097ca

core/java/android/net/NetworkPolicy.java

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ public class NetworkPolicy implements Parcelable, Comparable<NetworkPolicy> { 
    public static NetworkPolicy getNetworkPolicyFromBackup(DataInputStream in) throws IOException,

            BackupUtils.BadVersionException {

        final int version = in.readInt();

        if (version > VERSION_RAPID) {

        if (version < VERSION_INIT || version > VERSION_RAPID) {

            throw new BackupUtils.BadVersionException("Unknown backup version: " + version);

        }

core/java/android/util/RecurrenceRule.java

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ public class RecurrenceRule implements Parcelable { 
                start = convertZonedDateTime(BackupUtils.readString(in));

                end = convertZonedDateTime(BackupUtils.readString(in));

                period = convertPeriod(BackupUtils.readString(in));

                break;

            default:

                throw new ProtocolException("Unknown version " + version);

        }

packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java

+3 −3
Original line number Diff line number Diff line
@@ -49,12 +49,11 @@ import java.io.ByteArrayOutputStream; 
import java.io.DataInputStream;

import java.io.DataOutputStream;

import java.io.EOFException;

import java.io.File;

import java.io.FileInputStream;

import java.io.FileOutputStream;

import java.io.IOException;

import java.time.DateTimeException;

import java.util.Arrays;

import java.util.HashMap;

import java.util.HashSet;

import java.util.Map;

import java.util.zip.CRC32;
@@ -913,7 +912,8 @@ public class SettingsBackupAgent extends BackupAgentHelper { 
                }

                // Only set the policies if there was no error in the restore operation

                networkPolicyManager.setNetworkPolicies(policies);

            } catch (NullPointerException | IOException | BackupUtils.BadVersionException e) {

            } catch (NullPointerException | IOException | BackupUtils.BadVersionException

                    | DateTimeException e) {

                // NPE can be thrown when trying to instantiate a NetworkPolicy

                Log.e(TAG, "Failed to convert byte array to NetworkPolicies " + e.getMessage());

            }