Upgrade to Nullaway 0.10.18
Test: ./gradlew runErrorProne
Change-Id: I2356ecc3e958ccbb002a078e07fb05a7ce1edd86
diff --git a/browser/browser/src/main/java/androidx/browser/customtabs/CustomTabsClient.java b/browser/browser/src/main/java/androidx/browser/customtabs/CustomTabsClient.java
index d18f3c6..e445ca5 100644
--- a/browser/browser/src/main/java/androidx/browser/customtabs/CustomTabsClient.java
+++ b/browser/browser/src/main/java/androidx/browser/customtabs/CustomTabsClient.java
@@ -401,6 +401,7 @@
throws RemoteException {
if (callback == null) return;
mHandler.post(new Runnable() {
+ @SuppressWarnings("NullAway") // b/316641009
@Override
public void run() {
callback.onActivityResized(height, width, extras);
diff --git a/car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/RemoteProxyInputConnection.java b/car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/RemoteProxyInputConnection.java
index cd34e65..70e04c3 100644
--- a/car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/RemoteProxyInputConnection.java
+++ b/car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/RemoteProxyInputConnection.java
@@ -226,6 +226,7 @@
mServiceDispatcher.dispatch("closeConnection", mProxyInputConnection::closeConnection);
}
+ @SuppressWarnings("NullAway") // b/316639429
@Override
public boolean commitContent(@NonNull InputContentInfo inputContentInfo, int flags,
@Nullable Bundle bundle) {
diff --git a/car/app/app-projected/src/main/java/androidx/car/app/hardware/common/CarHardwareHostDispatcher.java b/car/app/app-projected/src/main/java/androidx/car/app/hardware/common/CarHardwareHostDispatcher.java
index cec6be8..03c3606 100644
--- a/car/app/app-projected/src/main/java/androidx/car/app/hardware/common/CarHardwareHostDispatcher.java
+++ b/car/app/app-projected/src/main/java/androidx/car/app/hardware/common/CarHardwareHostDispatcher.java
@@ -68,10 +68,12 @@
* @param result the callback where the result is returned
* @throws NullPointerException if {@code result} is {@code null}
*/
+ @SuppressWarnings("NullAway") // b/316639429
public void dispatchGetCarHardwareResult(int resultType, @Nullable Bundleable bundle,
@NonNull ICarHardwareResult result) {
requireNonNull(result);
RemoteUtils.dispatchCallToHost("getCarHardwareResult",
+
() -> {
getHost().getCarHardwareResult(
resultType,
@@ -90,6 +92,7 @@
* @param callback the callback where the result is returned
* @throws NullPointerException if {@code callback} is {@code null}
*/
+ @SuppressWarnings("NullAway") // b/316639429
public void dispatchSubscribeCarHardwareResult(int resultType, @Nullable Bundleable bundle,
@NonNull ICarHardwareResult callback) {
requireNonNull(callback);
@@ -110,6 +113,7 @@
* @param resultType the result type to fetch
* @throws NullPointerException if {@code callback} is {@code null}
*/
+ @SuppressWarnings("NullAway") // b/316639429
public void dispatchUnsubscribeCarHardwareResult(int resultType, @Nullable Bundleable bundle) {
RemoteUtils.dispatchCallToHost("unsubscribeCarHardwareResult",
() -> {
diff --git a/car/app/app/src/main/java/androidx/car/app/CarAppService.java b/car/app/app/src/main/java/androidx/car/app/CarAppService.java
index 8f216df..bf653a6 100644
--- a/car/app/app/src/main/java/androidx/car/app/CarAppService.java
+++ b/car/app/app/src/main/java/androidx/car/app/CarAppService.java
@@ -315,7 +315,7 @@
public final void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter writer,
@Nullable String[] args) {
super.dump(fd, writer, args);
-
+ if (args == null) return;
for (String arg : args) {
if (AUTO_DRIVE.equals(arg)) {
runOnMain(() -> {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 291df2d..07e29b5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -232,7 +232,7 @@
moshiAdapters = { module = "com.squareup.moshi:moshi-adapters", version.ref = "moshi" }
moshiCodeGen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "moshi" }
multidex = { module = "androidx.multidex:multidex", version = "2.0.1" }
-nullaway = { module = "com.uber.nullaway:nullaway", version = "0.3.7" }
+nullaway = { module = "com.uber.nullaway:nullaway", version = "0.10.18" }
okhttpMockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version = "3.14.7" }
okio = { module = "com.squareup.okio:okio", version = "3.4.0" }
opentest4j = { module = "org.opentest4j:opentest4j", version = "1.2.0" }
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index 416cb9f..2b1369f 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -4360,6 +4360,22 @@
=YmFm
-----END PGP PUBLIC KEY BLOCK-----
+pub 048639190E441950
+uid Uber Open Source Program <[email protected]>
+
+sub 9757C89E39C828B7
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+mDMEZUJpBRYJKwYBBAHaRw8BAQdAMUi1X0odyTiUuXIgDEYZZ4Pf4FQifp2UgYln
+s/XkBjO0KFViZXIgT3BlbiBTb3VyY2UgUHJvZ3JhbSA8b3Nwb0B1YmVyLmNvbT64
+OARlQmkFEgorBgEEAZdVAQUBAQdARwAOx/ADbrjCCBpVZY4xnGUl8zTFNNzLA5cx
+SE+VPFQDAQgHiH4EGBYKACYWIQRo8a6KPSbSPg0OE/8EhjkZDkQZUAUCZUJpBQIb
+DAUJBaOagAAKCRAEhjkZDkQZUJ7NAQCWdFlw9G9gRdXaZgepiCeJ187m58yOrgK7
+MMnp9o+7JAD/QyDtnf2+JD3MoSxLS4VoaNBtriu0tQD4g/SgNj5sLQc=
+=AeeO
+-----END PGP PUBLIC KEY BLOCK-----
+
pub 049FE94F2D5DAD9D
sub 953E02E4F573B46F
-----BEGIN PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 64acb1c..c6659bc 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -209,6 +209,7 @@
<trusted-key id="64B9B09F164AA0BF88742EB61188B69F6D6259CA" group="com.google.accompanist"/>
<trusted-key id="666A4692CE11B7B3F4EB7B3410066A9707090CF9" group="org.javassist"/>
<trusted-key id="682F765EEA718D250BBDB2F1685C46769DBB5E5D" group="com.squareup" name="kotlinpoet"/>
+ <trusted-key id="68F1AE8A3D26D23E0D0E13FF048639190E441950" group="com.uber.nullaway"/>
<trusted-key id="694621A7227D8D5289699830ABE9F3126BB741C1">
<trusting group="com.google.guava"/>
<trusting group="com.google.jimfs"/>
@@ -402,7 +403,6 @@
<trusted-key id="D433F9C895710DB8AB087FA6B7C3B43D18EAA8B7" group="org.codehaus.mojo"/>
<trusted-key id="D477D51812E692011DB11E66A6EA2E2BF22E0543" group="io.github.java-diff-utils"/>
<trusted-key id="D4C89EA4AAF455FD88B22087EFE8086F9E93774E" group="junit"/>
- <trusted-key id="D4FB0B7B5E8C18C993A8A386EB9D04A9A679FE18" group="com.uber.nullaway"/>
<trusted-key id="D54A395B5CF3F86EB45F6E426B1B008864323B92" group="org.antlr"/>
<trusted-key id="D5F46BC0B86AF5DC56DF58F05E975CB00C643DBF" group="com.google.inject"/>
<trusted-key id="D6F1BC78607808EC8E9F69437A8860944FAD5F62">
