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

Commit 1671ba24 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 

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

Change-Id: I307c7ded3464a9f59abf60e79b6bb991bab01862
parents 6df5d0fd 8bfacdf6

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);