Skip to content

Commit 8f45a97

Browse files
authored
binder: remove existing warnings and allow failOnWarnings (#10989)
1 parent 0b82f01 commit 8f45a97

File tree

6 files changed

+22
-6
lines changed

6 files changed

+22
-6
lines changed

binder/build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,12 @@ import net.ltgt.gradle.errorprone.CheckSeverity
7979

8080
tasks.withType(JavaCompile).configureEach {
8181
options.compilerArgs += [
82-
"-Xlint:-cast"
82+
"-Xlint:-cast",
83+
// For junit-1.15-api & org.robolectric/shadows-framework/4.11.1
84+
"-Xlint:-classfile",
85+
// Unclaimed annotations. TODO(jdcormie): Fix?
86+
"-Xlint:-processing",
8387
]
84-
options.compilerArgs -= ["-Werror"] // https://github.com/grpc/grpc-java/issues/10297
8588
appendToProperty(it.options.errorprone.excludedPaths, ".*/R.java", "|")
8689
}
8790

binder/src/main/java/io/grpc/binder/internal/MetadataHelper.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,9 @@ public static Metadata readMetadata(Parcel parcel, Attributes attributes) throws
148148
}
149149
int parcelableStartPos = parcel.dataPosition();
150150
try {
151+
// readParcelable(Classloader, Class<>) requires SDK 33 and at this layer we can't know
152+
// value's type anyway.
153+
@SuppressWarnings("deprecation")
151154
Parcelable value = parcel.readParcelable(MetadataHelper.class.getClassLoader());
152155
if (value == null) {
153156
throw Status.INTERNAL.withDescription("Read null parcelable in metadata").asException();

binder/src/main/java/io/grpc/binder/internal/ParcelableInputStream.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ final class ParcelableInputStream<P extends Parcelable> extends InputStream {
7979
@SuppressWarnings("unchecked")
8080
static <P extends Parcelable> ParcelableInputStream<P> readFromParcel(
8181
Parcel parcel, ClassLoader classLoader) {
82+
// readParcelable(Classloader, Class<P>) requires SDK 33 and this class isn't typesafe anyway.
83+
@SuppressWarnings("deprecation")
8284
P value = (P) parcel.readParcelable(classLoader);
8385
return new ParcelableInputStream<>(null, value, true);
8486
}

binder/src/test/java/io/grpc/binder/SecurityPoliciesTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,7 @@ public PackageInfoBuilder setSignatures(Signature... signatures) {
490490
return this;
491491
}
492492

493+
@SuppressWarnings("deprecation") // 'signatures': We don't yet support signing cert rotation.
493494
public PackageInfo build() {
494495
checkState(this.packageName != null, "packageName is a mandatory field");
495496

binder/src/test/java/io/grpc/binder/ServerSecurityPolicyTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public void testDefaultInternalOnly() throws Exception {
6262
}
6363

6464
@Test
65+
@Deprecated
6566
public void testDefaultInternalOnly_legacyApi() {
6667
policy = new ServerSecurityPolicy();
6768
assertThat(policy.checkAuthorizationForService(MY_UID, SERVICE1).getCode())
@@ -80,6 +81,7 @@ public void testInternalOnly_AnotherUid() throws Exception {
8081
}
8182

8283
@Test
84+
@Deprecated
8385
public void testInternalOnly_AnotherUid_legacyApi() {
8486
policy = new ServerSecurityPolicy();
8587
assertThat(policy.checkAuthorizationForService(OTHER_UID, SERVICE1).getCode())
@@ -98,6 +100,7 @@ public void testBuilderDefault() throws Exception {
98100
}
99101

100102
@Test
103+
@Deprecated
101104
public void testBuilderDefault_legacyApi() {
102105
policy = ServerSecurityPolicy.newBuilder().build();
103106
assertThat(policy.checkAuthorizationForService(MY_UID, SERVICE1).getCode())
@@ -125,6 +128,7 @@ public void testPerService() throws Exception {
125128

126129

127130
@Test
131+
@Deprecated
128132
public void testPerService_legacyApi() {
129133
policy =
130134
ServerSecurityPolicy.newBuilder()
@@ -251,6 +255,7 @@ SERVICE2, policy((uid) -> uid == OTHER_UID ? Status.OK : Status.PERMISSION_DENIE
251255
.isEqualTo(Status.PERMISSION_DENIED.getCode());
252256
}
253257
@Test
258+
@Deprecated
254259
public void testPerServiceNoDefault_legacyApi() {
255260
policy =
256261
ServerSecurityPolicy.newBuilder()

binder/src/test/java/io/grpc/binder/internal/ParcelableInputStreamTest.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,9 @@ public void testWriteToParcel() throws Exception {
8888
stream.writeToParcel(parcel);
8989

9090
parcel.setDataPosition(0);
91-
assertThat((TestParcelable) parcel.readParcelable(getClass().getClassLoader()))
92-
.isEqualTo(testParcelable);
91+
@SuppressWarnings("deprecation") // readParcelable(ClassLoader)'s replacement is only in 33+.
92+
TestParcelable clone = parcel.readParcelable(getClass().getClassLoader());
93+
assertThat(clone).isEqualTo(testParcelable);
9394
}
9495

9596
@Test
@@ -113,8 +114,9 @@ public void testAsRegularInputStream() throws Exception {
113114
parcel.unmarshall(data, 0, data.length);
114115
parcel.setDataPosition(0);
115116

116-
assertThat((TestParcelable) parcel.readParcelable(getClass().getClassLoader()))
117-
.isEqualTo(testParcelable);
117+
@SuppressWarnings("deprecation") // readParcelable(ClassLoader)'s replacement is only in 33+.
118+
TestParcelable clone = parcel.readParcelable(getClass().getClassLoader());
119+
assertThat(clone).isEqualTo(testParcelable);
118120
}
119121

120122
@Test

0 commit comments

Comments
 (0)