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

Resolve XML parser used to parse system data.

Browse Source 
We recently pivoted the default XML parser to write a new binary
XML schema, which requires all users to "resolve" to determine the
correct parser.

Bug: 157843394
Test: atest WallpaperBackupAgentTests
Change-Id: I84cc9f4e5b4abaedc014af54017096a1014d1e3a
This commit is contained in:
Jeff Sharkey
2020-12-21 13:31:37 -07:00
parent 18b99c5260
commit e72d3dec97
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java
View File

@@ -51,7 +51,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
public class WallpaperBackupAgent extends BackupAgent {
private static final String TAG = "WallpaperBackup";
@@ -323,8 +322,7 @@ public class WallpaperBackupAgent extends BackupAgent {
private Rect parseCropHint(File wallpaperInfo, String sectionTag) {
Rect cropHint = new Rect();
try (FileInputStream stream = new FileInputStream(wallpaperInfo)) {
XmlPullParser parser = Xml.newPullParser();
parser.setInput(stream, StandardCharsets.UTF_8.name());
XmlPullParser parser = Xml.resolvePullParser(stream);
int type;
do {
@@ -351,8 +349,7 @@ public class WallpaperBackupAgent extends BackupAgent {
private ComponentName parseWallpaperComponent(File wallpaperInfo, String sectionTag) {
ComponentName name = null;
try (FileInputStream stream = new FileInputStream(wallpaperInfo)) {
final XmlPullParser parser = Xml.newPullParser();
parser.setInput(stream, StandardCharsets.UTF_8.name());
final XmlPullParser parser = Xml.resolvePullParser(stream);
int type;
do {