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

Commit 8b78e30a authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Resolve XML parser used in tests. 

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: 176058231
Test: atest FrameworksMockingServicesTests:AppOpsUpgradeTest
Change-Id: I9de15ee359d8290b81e2029d7c30eac39a1781b9
parent 18b99c52

services/tests/mockingservicestests/src/com/android/server/appop/AppOpsUpgradeTest.java

+1 −4
Original line number Original line Diff line number Diff line
@@ -36,7 +36,6 @@ import android.os.HandlerThread; 
import android.util.Log;

import android.util.Log;

import android.util.SparseArray;

import android.util.SparseArray;

import android.util.TypedXmlPullParser;

import android.util.TypedXmlPullParser;

import android.util.TypedXmlSerializer;

import android.util.Xml;

import android.util.Xml;





import androidx.test.InstrumentationRegistry;

import androidx.test.InstrumentationRegistry;
@@ -53,7 +52,6 @@ import java.io.FileInputStream; 
import java.io.FileOutputStream;

import java.io.FileOutputStream;

import java.io.IOException;

import java.io.IOException;

import java.io.InputStream;

import java.io.InputStream;

import java.nio.charset.StandardCharsets;





/**

/**

 * Tests app ops version upgrades

 * Tests app ops version upgrades
@@ -183,8 +181,7 @@ public class AppOpsUpgradeTest { 




        boolean parse() {

        boolean parse() {

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

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

                TypedXmlPullParser parser = Xml.newFastPullParser();

                TypedXmlPullParser parser = Xml.resolvePullParser(stream);

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

                int type;

                int type;

                while ((type = parser.next()) != XmlPullParser.START_TAG

                while ((type = parser.next()) != XmlPullParser.START_TAG

                        && type != XmlPullParser.END_DOCUMENT) {

                        && type != XmlPullParser.END_DOCUMENT) {