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

Commit 3bfe1f39 authored by Mårten Kongstad's avatar Mårten Kongstad
Browse files

Mark ParsedConfiguration.parsedInfo as @Nullable 

The ParsedConfiguration.parsedInfo field is marked as @NonNull, but in
case the parsed configuration originated from an overlay config file (as
opposed to the legacy manifest based approach), the field will be null.
Change the field from @NonNull to @Nullable to reflect this.

Bug: N/A
Test: builds
Change-Id: I4119712a65d0f7c6caf2b4810457aeaa05eb2777
parent a027bec7

core/java/com/android/internal/content/om/OverlayConfigParser.java

+2 −2
Original line number Diff line number Diff line
@@ -95,11 +95,11 @@ final class OverlayConfigParser { 
        public final String policy;



        /** Information extracted from the manifest of the overlay. */

        @NonNull

        @Nullable

        public final ParsedOverlayInfo parsedInfo;



        ParsedConfiguration(@NonNull String packageName, boolean enabled, boolean mutable,

                @NonNull String policy, @NonNull ParsedOverlayInfo parsedInfo) {

                @NonNull String policy, @Nullable ParsedOverlayInfo parsedInfo) {

            this.packageName = packageName;

            this.enabled = enabled;

            this.mutable = mutable;