Skip to content

Commit 6b0eb2b

Browse files
committed
Add pre-auth override EAG attr and tests
Parameterize RobolectricBinderSecurityTest
1 parent f719b9c commit 6b0eb2b

2 files changed

Lines changed: 9 additions & 10 deletions

File tree

binder/src/main/java/io/grpc/binder/ApiConstants.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import android.content.Intent;
2020
import android.content.pm.ServiceInfo;
2121
import android.os.UserHandle;
22-
import io.grpc.Attributes;
2322
import io.grpc.ExperimentalApi;
2423
import io.grpc.NameResolver;
2524

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ public static ImmutableList<Boolean> data() {
7979

8080
@Before
8181
public void setUp() {
82-
ApplicationInfo serverAppInfo =
83-
ApplicationInfoBuilder.newBuilder().setPackageName(context.getPackageName()).build();
82+
ApplicationInfo serverAppInfo = ApplicationInfoBuilder.newBuilder()
83+
.setPackageName(context.getPackageName())
84+
.build();
8485
serverAppInfo.uid = android.os.Process.myUid();
85-
PackageInfo serverPkgInfo =
86-
PackageInfoBuilder.newBuilder()
87-
.setPackageName(serverAppInfo.packageName)
88-
.setApplicationInfo(serverAppInfo)
89-
.build();
86+
PackageInfo serverPkgInfo = PackageInfoBuilder.newBuilder()
87+
.setPackageName(serverAppInfo.packageName)
88+
.setApplicationInfo(serverAppInfo)
89+
.build();
9090
shadowOf(context.getPackageManager()).installPackage(serverPkgInfo);
9191

9292
ServiceInfo serviceInfo = new ServiceInfo();
@@ -95,8 +95,8 @@ public void setUp() {
9595
serviceInfo.applicationInfo = serverAppInfo;
9696
shadowOf(context.getPackageManager()).addOrUpdateService(serviceInfo);
9797

98-
AndroidComponentAddress listenAddress =
99-
AndroidComponentAddress.forRemoteComponent(serviceInfo.packageName, serviceInfo.name);
98+
AndroidComponentAddress listenAddress = AndroidComponentAddress.forRemoteComponent(
99+
serviceInfo.packageName, serviceInfo.name);
100100

101101
MethodDescriptor<Empty, Empty> methodDesc = getMethodDescriptor();
102102
ServerCallHandler<Empty, Empty> callHandler =

0 commit comments

Comments
 (0)