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

Commit 90499383 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix nullpointer exception in CompatConfig" into sc-dev am:... 

Merge "Merge "Fix nullpointer exception in CompatConfig" into sc-dev am: 8bfacdf6 am: 2fd01c47" into sc-v2-dev-plus-aosp
parents 53c27d91 a99f29e1

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