Fix ImpossibleNullComparison errorprone warning

Protobuf fields cannot be null.

Bug: 253827323
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I079f2968cd0de9a511b82523fbabae4730d18a04

2 files changed, 50 insertions, 39 deletions

diff --git a/adservices/service-core/java/com/android/adservices/download/EnrollmentDataDownloadManager.java b/adservices/service-core/java/com/android/adservices/download/EnrollmentDataDownloadManager.java
index 710620201..7b4a65301 100644
--- a/adservices/service-core/java/com/android/adservices/download/EnrollmentDataDownloadManager.java
+++ b/adservices/service-core/java/com/android/adservices/download/EnrollmentDataDownloadManager.java
@@ -314,21 +314,15 @@ public class EnrollmentDataDownloadManager {
         SharedPreferences prefs =
                 mContext.getSharedPreferences(ENROLLMENT_SHARED_PREF, Context.MODE_PRIVATE);
         SharedPreferences.Editor edit = prefs.edit();
-        if (buildId != null) {
-            edit.putInt(BUILD_ID, buildId.intValue());
-        }
-        if (fileGroupStatus != null) {
-            edit.putInt(FILE_GROUP_STATUS, fileGroupStatus.getNumber());
-        }
-        if (buildId != null || fileGroupStatus != null) {
-            if (!edit.commit()) {
-                LogUtil.e(
-                        "Saving shared preferences - %s , %s and %s failed",
-                        ENROLLMENT_SHARED_PREF, BUILD_ID, FILE_GROUP_STATUS);
-                ErrorLogUtil.e(
-                        AD_SERVICES_ERROR_REPORTED__ERROR_CODE__SHARED_PREF_UPDATE_FAILURE,
-                        AD_SERVICES_ERROR_REPORTED__PPAPI_NAME__MEASUREMENT);
-            }
+        edit.putInt(BUILD_ID, buildId.intValue());
+        edit.putInt(FILE_GROUP_STATUS, fileGroupStatus.getNumber());
+        if (!edit.commit()) {
+            LogUtil.e(
+                    "Saving shared preferences - %s , %s and %s failed",
+                    ENROLLMENT_SHARED_PREF, BUILD_ID, FILE_GROUP_STATUS);
+            ErrorLogUtil.e(
+                    AD_SERVICES_ERROR_REPORTED__ERROR_CODE__SHARED_PREF_UPDATE_FAILURE,
+                    AD_SERVICES_ERROR_REPORTED__PPAPI_NAME__MEASUREMENT);
         }
     }
 }
diff --git a/adservices/tests/unittest/service-core/src/com/android/adservices/download/EnrollmentDataDownloadManagerTest.java b/adservices/tests/unittest/service-core/src/com/android/adservices/download/EnrollmentDataDownloadManagerTest.java
index a5ac1a8ca..9fe57ed5e 100644
--- a/adservices/tests/unittest/service-core/src/com/android/adservices/download/EnrollmentDataDownloadManagerTest.java
+++ b/adservices/tests/unittest/service-core/src/com/android/adservices/download/EnrollmentDataDownloadManagerTest.java
@@ -66,7 +66,6 @@ import org.mockito.Mock;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CancellationException;
@@ -82,10 +81,6 @@ public class EnrollmentDataDownloadManagerTest {
 
     @Mock private EnrollmentDao mMockEnrollmentDao;
 
-    @Mock private ClientFileGroup mMockFileGroup;
-
-    @Mock private ClientFile mMockFile;
-
     @Mock private MobileDataDownload mMockMdd;
     @Mock private AdServicesLogger mLogger;
     @Mock private EnrollmentUtil mEnrollmentUtil;
@@ -136,11 +131,17 @@ public class EnrollmentDataDownloadManagerTest {
                 new EnrollmentDataDownloadManager(
                         sContext, mMockFlags, mLogger, mEnrollmentUtil, mEncryptionKeyFetcher);
 
-        when(mMockMdd.getFileGroup(any())).thenReturn(Futures.immediateFuture(mMockFileGroup));
-        when(mMockFileGroup.getFileList()).thenReturn(Collections.singletonList(mMockFile));
-        when(mMockFileGroup.getBuildId()).thenReturn(1L);
-        when(mMockFile.getFileId()).thenReturn("adtech_enrollment_data.csv");
-        when(mMockFile.getFileUri()).thenReturn("adtech_enrollment_data.csv");
+        when(mMockMdd.getFileGroup(any()))
+                .thenReturn(
+                        Futures.immediateFuture(
+                                ClientFileGroup.newBuilder()
+                                        .addFile(
+                                                ClientFile.newBuilder()
+                                                        .setFileId("adtech_enrollment_data.csv")
+                                                        .setFileUri("adtech_enrollment_data.csv")
+                                                        .build())
+                                        .setBuildId(1)
+                                        .build()));
         when(mMockFlags.getEnrollmentMddRecordDeletionEnabled()).thenReturn(false);
         when(mMockFlags.getEncryptionKeyNewEnrollmentFetchKillSwitch()).thenReturn(false);
         when(mMockFlags.getEncryptionKeyNetworkConnectTimeoutMs())
@@ -215,9 +216,15 @@ public class EnrollmentDataDownloadManagerTest {
                 new EnrollmentDataDownloadManager(
                         sContext, mMockFlags, mLogger, mEnrollmentUtil, mEncryptionKeyFetcher);
 
-        when(mMockMdd.getFileGroup(any())).thenReturn(Futures.immediateFuture(mMockFileGroup));
-        when(mMockFileGroup.getFileList()).thenReturn(Collections.singletonList(mMockFile));
-        when(mMockFile.getFileId()).thenReturn("wrong_file_id.csv");
+        when(mMockMdd.getFileGroup(any()))
+                .thenReturn(
+                        Futures.immediateFuture(
+                                ClientFileGroup.newBuilder()
+                                        .addFile(
+                                                ClientFile.newBuilder()
+                                                        .setFileId("wrong_file_id.csv")
+                                                        .build())
+                                        .build()));
 
         verifyEnrollmentDataDownloadStatus(
                 EnrollmentDataDownloadManager.DownloadStatus.NO_FILE_AVAILABLE);
@@ -241,8 +248,6 @@ public class EnrollmentDataDownloadManagerTest {
 
         when(mMockMdd.getFileGroup(any()))
                 .thenReturn(Futures.immediateFailedFuture(new CancellationException()));
-        when(mMockFileGroup.getFileList()).thenReturn(Collections.singletonList(mMockFile));
-        when(mMockFile.getFileId()).thenReturn("adtech_enrollment_data.csv");
 
         verifyEnrollmentDataDownloadStatus(
                 EnrollmentDataDownloadManager.DownloadStatus.NO_FILE_AVAILABLE);
@@ -267,10 +272,16 @@ public class EnrollmentDataDownloadManagerTest {
                 new EnrollmentDataDownloadManager(
                         sContext, mMockFlags, mLogger, mEnrollmentUtil, mEncryptionKeyFetcher);
 
-        when(mMockMdd.getFileGroup(any())).thenReturn(Futures.immediateFuture(mMockFileGroup));
-        when(mMockFileGroup.getFileList()).thenReturn(Collections.singletonList(mMockFile));
-        when(mMockFile.getFileId()).thenReturn("adtech_enrollment_data.csv");
-        when(mMockFile.getFileUri()).thenReturn("adtech_enrollment_data.csv");
+        when(mMockMdd.getFileGroup(any()))
+                .thenReturn(
+                        Futures.immediateFuture(
+                                ClientFileGroup.newBuilder()
+                                        .addFile(
+                                                ClientFile.newBuilder()
+                                                        .setFileId("adtech_enrollment_data.csv")
+                                                        .setFileUri("adtech_enrollment_data.csv")
+                                                        .build())
+                                        .build()));
         when(mMockFlags.getEnrollmentMddRecordDeletionEnabled()).thenReturn(false);
 
         ArgumentCaptor<EnrollmentData> captor = ArgumentCaptor.forClass(EnrollmentData.class);
@@ -299,11 +310,17 @@ public class EnrollmentDataDownloadManagerTest {
                 new EnrollmentDataDownloadManager(
                         sContext, mMockFlags, mLogger, mEnrollmentUtil, mEncryptionKeyFetcher);
 
-        when(mMockMdd.getFileGroup(any())).thenReturn(Futures.immediateFuture(mMockFileGroup));
-        when(mMockFileGroup.getFileList()).thenReturn(Collections.singletonList(mMockFile));
-        when(mMockFileGroup.getBuildId()).thenReturn(1L);
-        when(mMockFile.getFileId()).thenReturn("adtech_enrollment_data.csv");
-        when(mMockFile.getFileUri()).thenReturn("adtech_enrollment_data.csv");
+        when(mMockMdd.getFileGroup(any()))
+                .thenReturn(
+                        Futures.immediateFuture(
+                                ClientFileGroup.newBuilder()
+                                        .addFile(
+                                                ClientFile.newBuilder()
+                                                        .setFileId("adtech_enrollment_data.csv")
+                                                        .setFileUri("adtech_enrollment_data.csv")
+                                                        .build())
+                                        .setBuildId(1)
+                                        .build()));
         when(mMockFlags.getEnrollmentMddRecordDeletionEnabled()).thenReturn(true);
         when(mMockFlags.getEncryptionKeyNewEnrollmentFetchKillSwitch()).thenReturn(false);
         when(mMockFlags.getEncryptionKeyNetworkConnectTimeoutMs())