From 3bfe1f39a056e5521e3b9da74313388564b9b3ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= <amhk@google.com>
Date: Tue, 15 Mar 2022 15:35:31 +0000
Subject: [PATCH] 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
---
 .../com/android/internal/content/om/OverlayConfigParser.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/com/android/internal/content/om/OverlayConfigParser.java b/core/java/com/android/internal/content/om/OverlayConfigParser.java
index 0ab7b3d2ef867..8167df3062f20 100644
--- a/core/java/com/android/internal/content/om/OverlayConfigParser.java
+++ b/core/java/com/android/internal/content/om/OverlayConfigParser.java
@@ -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;