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

Merge "Throw XmlParserException when client tag cannot be found when parsing slice permissions." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-11 00:55:38 +00:00
committed by Android (Google) Code Review
parent b14310b5ef 427f4f67a7
commit 4a487001b7
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/slice/SliceClientPermissions.java
View File

@@ -160,6 +160,9 @@ public class SliceClientPermissions implements DirtyTracker, Persistable {
// Get to the beginning of the provider.
while (parser.getEventType() != XmlPullParser.START_TAG
|| !TAG_CLIENT.equals(parser.getName())) {
if (parser.getEventType() == XmlPullParser.END_DOCUMENT) {
throw new XmlPullParserException("Can't find client tag in xml");
}
parser.next();
}
int depth = parser.getDepth();
@@ -173,6 +176,9 @@ public class SliceClientPermissions implements DirtyTracker, Persistable {
parser.next();
while (parser.getDepth() > depth) {
if (parser.getEventType() == XmlPullParser.END_DOCUMENT) {
return provider;
}
if (parser.getEventType() == XmlPullParser.START_TAG
&& TAG_AUTHORITY.equals(parser.getName())) {
try {