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

Merge "Fix nullpointer exception in CompatConfig" into sc-dev

Browse Source
This commit is contained in:
Andrei-Valentin Onea
2021-06-24 17:56:24 +00:00
committed by Android (Google) Code Review
parent e06a55ba9f 35d1a84771
commit 8bfacdf641
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/compat/CompatConfig.java
View File

@@ -603,6 +603,10 @@ final class CompatConfig {
try (InputStream in = new BufferedInputStream(new FileInputStream(overridesFile))) { try (InputStream in = new BufferedInputStream(new FileInputStream(overridesFile))) {
Overrides overrides = com.android.server.compat.overrides.XmlParser.read(in); Overrides overrides = com.android.server.compat.overrides.XmlParser.read(in);
if (overrides == null) {
Slog.w(TAG, "Parsing " + overridesFile.getPath() + " failed");
return;
}
for (ChangeOverrides changeOverrides : overrides.getChangeOverrides()) { for (ChangeOverrides changeOverrides : overrides.getChangeOverrides()) {
long changeId = changeOverrides.getChangeId(); long changeId = changeOverrides.getChangeId();
CompatChange compatChange = mChanges.get(changeId); CompatChange compatChange = mChanges.get(changeId);