Android : Addressed review comments and reformat code (issue 6868)

Author: Sangamesh1997

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

@@ -17,15 +17,12 @@
 package io.grpc.binder;
 
 import static android.content.Intent.URI_ANDROID_APP_SCHEME;
-import static android.content.Intent.URI_INTENT_SCHEME;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 
-import android.annotation.SuppressLint;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.os.UserHandle;
 import com.google.common.base.Objects;
 import io.grpc.ExperimentalApi;
@@ -175,8 +172,7 @@ public String asAndroidAppUri() {
       // factory methods. Oddly, a ComponentName is not enough.
       intentForUri = intentForUri.cloneFilter().setPackage(getComponent().getPackageName());
     }
-    return intentForUri.toUri(
-            URI_ANDROID_APP_SCHEME);
+    return intentForUri.toUri(URI_ANDROID_APP_SCHEME);
   }
 
   @Override

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

@@ -196,23 +196,23 @@ private static Status bindInternal(
           if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             bindResult = context.bindServiceAsUser(bindIntent, conn, flags, targetUserHandle);
           } else {
-            return Status.INTERNAL.
-                    withDescription("Cross user Channel requires Android R+");
+            return Status.INTERNAL.withDescription("Cross user Channel requires Android R+");
           }
           break;
         case DEVICE_POLICY_BIND_SEVICE_ADMIN:
           DevicePolicyManager devicePolicyManager =
-                  (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
+              (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
           if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            bindResult = devicePolicyManager.bindDeviceAdminServiceAsUser(
-                            channelCredentials.getDevicePolicyAdminComponentName(),
-                            bindIntent,
-                            conn,
-                            flags,
-                            targetUserHandle);
+            bindResult =
+                devicePolicyManager.bindDeviceAdminServiceAsUser(
+                    channelCredentials.getDevicePolicyAdminComponentName(),
+                    bindIntent,
+                    conn,
+                    flags,
+                    targetUserHandle);
           } else {
-            return Status.INTERNAL.
-                    withDescription("Device policy admin binding requires Android R+");
+            return Status.INTERNAL.withDescription(
+                "Device policy admin binding requires Android R+");
           }
           break;
       }

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

@@ -21,7 +21,6 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
 import static org.robolectric.Shadows.shadowOf;
 
 import android.app.Application;
@@ -331,8 +330,8 @@ public void testResolveNonExistentServiceWithTargetUserThrows() throws Exception
 
   @Test
   @Config(sdk = 30)
-  public void testBindService_doesNotThrowInternalErrorWhenSDkAtLeastR() {
-    UserHandle userHandle = mock(UserHandle.class);
+  public void testBindService_doesNotThrowInternalErrorWhenSdkAtLeastR() {
+    UserHandle userHandle = generateUserHandle(/* userId= */ 12345);
     binding = newBuilder().setTargetUserHandle(userHandle).build();
     binding.bind();
     shadowOf(getMainLooper()).idle();
@@ -343,31 +342,34 @@ public void testBindService_doesNotThrowInternalErrorWhenSDkAtLeastR() {
 
   @Test
   @Config(sdk = 28)
-  public void testBindServiceAsUser_returnsErrorWhenSDkBelowR() {
-    UserHandle userHandle = mock(UserHandle.class);
+  public void testBindServiceAsUser_returnsErrorWhenSdkBelowR() {
+    UserHandle userHandle = generateUserHandle(/* userId= */ 12345);
     binding = newBuilder().setTargetUserHandle(userHandle).build();
     binding.bind();
     shadowOf(getMainLooper()).idle();
 
     assertThat(observer.unboundReason.getCode()).isEqualTo(Code.INTERNAL);
-    assertThat(observer.unboundReason.getDescription()).isEqualTo("Cross user Channel requires Android R+");
+    assertThat(observer.unboundReason.getDescription())
+        .isEqualTo("Cross user Channel requires Android R+");
   }
 
   @Test
   @Config(sdk = 28)
-  public void testDevicePolicyBlind_returnsErrorWhenSDkBelowR() {
+  public void testDevicePolicyBlind_returnsErrorWhenSdkBelowR() {
     String deviceAdminClassName = "DevicePolicyAdmin";
     ComponentName adminComponent = new ComponentName(appContext, deviceAdminClassName);
-    allowBindDeviceAdminForUser(appContext, adminComponent,10);
-    binding = newBuilder()
-                    .setTargetUserHandle(UserHandle.getUserHandleForUid(10))
-                    .setChannelCredentials(BinderChannelCredentials.forDevicePolicyAdmin(adminComponent))
-                    .build();
+    allowBindDeviceAdminForUser(appContext, adminComponent, 10);
+    binding =
+        newBuilder()
+            .setTargetUserHandle(UserHandle.getUserHandleForUid(10))
+            .setChannelCredentials(BinderChannelCredentials.forDevicePolicyAdmin(adminComponent))
+            .build();
     binding.bind();
     shadowOf(getMainLooper()).idle();
 
     assertThat(observer.unboundReason.getCode()).isEqualTo(Code.INTERNAL);
-    assertThat(observer.unboundReason.getDescription()).isEqualTo("Device policy admin binding requires Android R+");
+    assertThat(observer.unboundReason.getDescription())
+        .isEqualTo("Device policy admin binding requires Android R+");
   }
 
   @Test