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

Commit a99f29e1 authored by Andrei-Valentin Onea's avatar Andrei-Valentin Onea Committed by Automerger Merge Worker
Browse files

Merge "Fix nullpointer exception in CompatConfig" into sc-dev am: 8bfacdf6 am: 2fd01c47 

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

Change-Id: Iaa8052a08491952a063aa23672b5889ec82e388b
parents cc902b5f 2fd01c47

services/core/java/com/android/server/compat/CompatConfig.java

+4 −0
Original line number Diff line number Diff line
@@ -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);