From 38819fd90668149cf88fe519a503013c671dd4b7 Mon Sep 17 00:00:00 2001
From: Michael Groover <mpgroover@google.com>
Date: Thu, 16 Mar 2023 11:24:46 -0500
Subject: [PATCH] Make CheckReturnValue errorprone check a warning for unit
 tests

CredentialManagerPreferenceControllerTest now differs between the
current development branch and internal main, and the
CheckReturnValue errorprone is failing in the branches that use
the code from the development branch. Modifying
CredentialManagerPreferenceControllerTest does not resolve this
because it results in merge conflicts, but making this check a
warning in the development branch will allow the fix to reach all
affected branches.

Fixes: 273833063
Test: m RUN_ERROR_PRONE=true SettingsUnitTests
Change-Id: Ia923f0d988b1428cbb7378f33b4703ed19113dcd
---
 tests/unit/Android.bp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 249ce7223fc..4e2b3be8a65 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -36,6 +36,10 @@ android_test {
         // instrumented Settings app.
     ],
 
+    errorprone: {
+        javacflags: ["-Xep:CheckReturnValue:WARN"]
+    },
+
     // Include all test java files.
     srcs: ["src/**/*.java"],