grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

binder: Avoid an ISE from asAndroidAppUri() (#9169)

This commit is contained in:
John Cormie 2022-05-16 17:33:16 -07:00 committed by GitHub
parent a88f19fb4b
commit 3f19dfaf4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
binder/src/main/java/io/grpc/binder/AndroidComponentAddress.java
View File

@ -121,9 +121,17 @@ public class AndroidComponentAddress extends SocketAddress { // NOTE: Only tempo
/**
* Returns this address as an "android-app://" uri.
*
* <p>See {@link Intent#URI_ANDROID_APP_SCHEME} for details.
*/
public String asAndroidAppUri() {
return bindIntent.toUri(URI_ANDROID_APP_SCHEME);
Intent intentForUri = bindIntent;
if (intentForUri.getPackage() == null) {
// URI_ANDROID_APP_SCHEME requires an "explicit package name" which isn't set by any of our
// factory methods. Oddly, our explicit ComponentName is not enough.
intentForUri = intentForUri.cloneFilter().setPackage(getComponent().getPackageName());
}
return intentForUri.toUri(URI_ANDROID_APP_SCHEME);
}
@Override

26
binder/src/test/java/io/grpc/binder/AndroidComponentAddressTest.java
View File

@ -16,6 +16,7 @@
package io.grpc.binder;
import static android.content.Intent.URI_ANDROID_APP_SCHEME;
import static com.google.common.truth.Truth.assertThat;
import android.content.ComponentName;
@ -24,6 +25,7 @@ import android.content.Intent;
import android.net.Uri;
import androidx.test.core.app.ApplicationProvider;
import com.google.common.testing.EqualsTester;
import java.net.URISyntaxException;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
@ -61,6 +63,30 @@ public final class AndroidComponentAddressTest {
assertThat(addr.asBindIntent().filterEquals(bindIntent)).isTrue();
}
@Test
@Config(sdk = 30)
public void testAsAndroidAppUriSdk30() throws URISyntaxException {
AndroidComponentAddress addr =
AndroidComponentAddress.forRemoteComponent("com.foo", "com.foo.Service");
AndroidComponentAddress addrClone =
AndroidComponentAddress.forBindIntent(
Intent.parseUri(addr.asAndroidAppUri(), URI_ANDROID_APP_SCHEME));
assertThat(addr).isEqualTo(addrClone);
}
@Test
@Config(sdk = 29)
public void testAsAndroidAppUriSdk29() throws URISyntaxException {
AndroidComponentAddress addr =
AndroidComponentAddress.forRemoteComponent("com.foo", "com.foo.Service");
AndroidComponentAddress addrClone =
AndroidComponentAddress.forBindIntent(
Intent.parseUri(addr.asAndroidAppUri(), URI_ANDROID_APP_SCHEME));
// Can't test for equality because URI_ANDROID_APP_SCHEME adds a (redundant) package filter.
assertThat(addr.getComponent()).isEqualTo(addrClone.getComponent());
assertThat(addr.getAuthority()).isEqualTo(addrClone.getAuthority());
}
@Test
public void testEquality() {
new EqualsTester()