commit 5cc1f3451ff54689a4f49b4f86cae68643bc157c
author Armaan Danewalia <adanewalia@google.com> Fri Feb 07 22:35:04 2025 +0000
committer Armaan Danewalia <adanewalia@google.com> Fri Feb 07 14:55:05 2025 -0800
tree 8fd87e18594b7e4e41db317ee4de57d02be6c6f0
parent 758118bd97a9b53a5731704dc22cb6ff82821fe7

Add jspecify NonNull to FrameworkServiceAppSearchConfig.

Bug: 352556856
Bug: 332382299
Test: Presubmit
Flag: EXEMPT bugfix
Change-Id: I99d440802bd3190afc05fd4cbb2961b0b975a759

service/java/com/android/server/appsearch/FrameworkServiceAppSearchConfig.java

diff --git a/service/java/com/android/server/appsearch/FrameworkServiceAppSearchConfig.java b/service/java/com/android/server/appsearch/FrameworkServiceAppSearchConfig.java
index 72c4cc7..61f9142 100644
--- a/service/java/com/android/server/appsearch/FrameworkServiceAppSearchConfig.java
+++ b/service/java/com/android/server/appsearch/FrameworkServiceAppSearchConfig.java
@@ -19,7 +19,6 @@
 import static com.android.server.appsearch.isolated_storage_service.IsolatedStorageServiceManager.DEFAULT_MAX_PAGE_BYTES_LIMIT_FOR_ISOLATED_STORAGE;
 import static com.android.server.appsearch.isolated_storage_service.IsolatedStorageServiceManager.isolatedStorageFlagsSet;
 
-import android.annotation.NonNull;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.DeviceConfig;
@@ -32,6 +31,8 @@
 
 import com.google.android.icing.proto.PersistType;
 
+import org.jspecify.annotations.NonNull;
+
 import java.util.Objects;
 import java.util.concurrent.Executor;
 
@@ -655,7 +656,7 @@
     // The absolute path for the ICU data file is not available in Framework.
     // This method is functionally no-op and returns an empty string.
     @Override
-    public String getIcuDataFileAbsolutePath() {
+    public @NonNull String getIcuDataFileAbsolutePath() {
         return DEFAULT_ICU_DATA_FILE_ABSOLUTE_PATH;
     }
 
@@ -695,7 +696,7 @@
     }
 
     @Override
-    public PersistType.Code getLightweightPersistType() {
+    public PersistType.@NonNull Code getLightweightPersistType() {
         return PersistType.Code.LITE;
     }
 
@@ -706,7 +707,7 @@
         }
     }
 
-    private void updateCachedValues(@NonNull DeviceConfig.Properties properties) {
+    private void updateCachedValues(DeviceConfig.@NonNull Properties properties) {
         for (String key : properties.getKeyset()) {
             updateCachedValue(key, properties);
         }
@@ -714,7 +715,7 @@
     }
 
     private void updateCachedValue(
-            @NonNull String key, @NonNull DeviceConfig.Properties properties) {
+            @NonNull String key, DeviceConfig.@NonNull Properties properties) {
         if (properties.getString(key, /* defaultValue= */ null) == null) {
             // Key is missing or value is just null. That is not expected if the key is
             // defined in the configuration.