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 am: 8bfacdf641

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15094010

Change-Id: I8048d1bd6a94b3a4a34387f74a09d787c8663b0b
This commit is contained in:
Andrei-Valentin Onea
2021-06-24 18:08:59 +00:00
committed by Automerger Merge Worker
parent 7e244f216d 8bfacdf641
commit 7637256224
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))) {
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()) {
long changeId = changeOverrides.getChangeId();
CompatChange compatChange = mChanges.get(changeId);