Android : Worked on review comments (Binder)

Author: Sangamesh1997

android/build.gradle

@@ -14,7 +14,7 @@ android {
     }
     compileSdkVersion 34
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 22
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"

binder/build.gradle

@@ -13,7 +13,7 @@ android {
         targetCompatibility 1.8
     }
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 22
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"

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

@@ -176,9 +176,7 @@ public String asAndroidAppUri() {
       intentForUri = intentForUri.cloneFilter().setPackage(getComponent().getPackageName());
     }
     return intentForUri.toUri(
-              Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1
-              ? URI_ANDROID_APP_SCHEME
-              : URI_INTENT_SCHEME);
+            URI_ANDROID_APP_SCHEME);
   }
 
   @Override

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

@@ -195,18 +195,24 @@ private static Status bindInternal(
         case BIND_SERVICE_AS_USER:
           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+");
           }
           break;
         case DEVICE_POLICY_BIND_SEVICE_ADMIN:
           DevicePolicyManager devicePolicyManager =
                   (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             bindResult = devicePolicyManager.bindDeviceAdminServiceAsUser(
                             channelCredentials.getDevicePolicyAdminComponentName(),
                             bindIntent,
                             conn,
                             flags,
                             targetUserHandle);
+          } else {
+            return Status.INTERNAL.
+                    withDescription("Device policy admin binding requires Android R+");
           }
           break;
       }

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

@@ -21,6 +21,7 @@
 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;
@@ -29,6 +30,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ServiceInfo;
+import android.os.Build;
 import android.os.IBinder;
 import android.os.Parcel;
 import android.os.UserHandle;
@@ -327,6 +329,47 @@ public void testResolveNonExistentServiceWithTargetUserThrows() throws Exception
     assertThat(statusException.getStatus().getDescription()).contains("12345");
   }
 
+  @Test
+  @Config(sdk = 30)
+  public void testBindService_doesNotThrowInternalErrorWhenSDkAtLeastR() {
+    UserHandle userHandle = mock(UserHandle.class);
+    binding = newBuilder().setTargetUserHandle(userHandle).build();
+    binding.bind();
+    shadowOf(getMainLooper()).idle();
+
+    assertThat(Build.VERSION.SDK_INT).isEqualTo(Build.VERSION_CODES.R);
+    assertThat(observer.unboundReason).isNull();
+  }
+
+  @Test
+  @Config(sdk = 28)
+  public void testBindServiceAsUser_returnsErrorWhenSDkBelowR() {
+    UserHandle userHandle = mock(UserHandle.class);
+    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+");
+  }
+
+  @Test
+  @Config(sdk = 28)
+  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();
+    binding.bind();
+    shadowOf(getMainLooper()).idle();
+
+    assertThat(observer.unboundReason.getCode()).isEqualTo(Code.INTERNAL);
+    assertThat(observer.unboundReason.getDescription()).isEqualTo("Device policy admin binding requires Android R+");
+  }
+
   @Test
   @Config(sdk = 30)
   public void testBindWithDeviceAdmin() throws Exception {

cronet/build.gradle

@@ -14,7 +14,7 @@ android {
     namespace = 'io.grpc.cronet'
     compileSdkVersion 33
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 22
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"

lint.xml

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
+    <!--
+      Suppress temporarily due to AAPT2 failures with SDK 35/36 on AGP 7.x.
+      Remove after AGP upgrade.
+    -->
     <issue id="OldTargetApi" severity="ignore" />
 </lint>