Merge "Resolve XML parser used to parse system data."

import java.io.FileInputStream;

import java.io.FileInputStream;

import java.io.FileOutputStream;

import java.io.FileOutputStream;

import java.io.IOException;

import java.io.IOException;

import java.nio.charset.StandardCharsets;

public class WallpaperBackupAgent extends BackupAgent {

public class WallpaperBackupAgent extends BackupAgent {

    private static final String TAG = "WallpaperBackup";

    private static final String TAG = "WallpaperBackup";

    private Rect parseCropHint(File wallpaperInfo, String sectionTag) {

    private Rect parseCropHint(File wallpaperInfo, String sectionTag) {

        Rect cropHint = new Rect();

        Rect cropHint = new Rect();

        try (FileInputStream stream = new FileInputStream(wallpaperInfo)) {

        try (FileInputStream stream = new FileInputStream(wallpaperInfo)) {

            XmlPullParser parser = Xml.newPullParser();

            XmlPullParser parser = Xml.resolvePullParser(stream);

            parser.setInput(stream, StandardCharsets.UTF_8.name());

            int type;

            int type;

            do {

            do {

    private ComponentName parseWallpaperComponent(File wallpaperInfo, String sectionTag) {

    private ComponentName parseWallpaperComponent(File wallpaperInfo, String sectionTag) {

        ComponentName name = null;

        ComponentName name = null;

        try (FileInputStream stream = new FileInputStream(wallpaperInfo)) {

        try (FileInputStream stream = new FileInputStream(wallpaperInfo)) {

            final XmlPullParser parser = Xml.newPullParser();

            final XmlPullParser parser = Xml.resolvePullParser(stream);

            parser.setInput(stream, StandardCharsets.UTF_8.name());

            int type;

            int type;

            do {

            do {