Skip to content

Android: Clean up lint warnings and other warnings to get build success #12143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Android: Clean up lint warnings and other warnings to get build success #12143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3f241f8
Android: worked on lint and build warnings
Sangamesh1997 Jun 10, 2025
77bed78
Merge branch 'grpc:master' into Issue_fixed_12142
Sangamesh1997 Jun 12, 2025
c414609
Merge branch 'grpc:master' into Issue_fixed_12142
Sangamesh1997 Jun 13, 2025
03b453b
Merge branch 'grpc:master' into Issue_fixed_12142
Sangamesh1997 Jun 18, 2025
53a4385
Merge branch 'grpc:master' into Issue_fixed_12142
Sangamesh1997 Jun 25, 2025
e5272b3
Merge branch 'grpc:master' into Issue_fixed_12142
Sangamesh1997 Jul 1, 2025
37f84d1
Merge branch 'grpc:master' into Issue_fixed_12142
Sangamesh1997 Jul 3, 2025
65fab31
Merge remote-tracking branch 'origin/Issue_fixed_12142' into Issue_fi…
Sangamesh1997 Jul 11, 2025
1655cb4
Android: fixed internal review points
Sangamesh1997 Jul 11, 2025
513c4d5
Merge branch 'grpc:master' into Issue_fixed_12142
Sangamesh1997 Jul 14, 2025
356f345
Android: worked on lint and build warnings
Sangamesh1997 Jul 14, 2025
f9e6703
Merge branch 'grpc:master' into Issue_fixed_12142
Sangamesh1997 Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions android/src/main/java/io/grpc/android/AndroidChannelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ private void configureNetworkMonitoring() {
connectivityManager.registerDefaultNetworkCallback(defaultNetworkCallback);
unregisterRunnable =
new Runnable() {
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override
public void run() {
connectivityManager.unregisterNetworkCallback(defaultNetworkCallback);
Expand All @@ -231,7 +230,6 @@ public void run() {
context.registerReceiver(networkReceiver, networkIntentFilter);
unregisterRunnable =
new Runnable() {
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override
public void run() {
context.unregisterReceiver(networkReceiver);
Expand Down
8 changes: 7 additions & 1 deletion binder/src/main/java/io/grpc/binder/AndroidComponentAddress.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@
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;
Expand Down Expand Up @@ -172,7 +175,10 @@ 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(
Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1
? URI_ANDROID_APP_SCHEME
: URI_INTENT_SCHEME);
}

@Override
Expand Down
2 changes: 0 additions & 2 deletions binder/src/main/java/io/grpc/binder/SecurityPolicies.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ public Status checkAuthorization(int uid) {
* Creates {@link SecurityPolicy} which checks if the app is a device owner app. See {@link
* DevicePolicyManager}.
*/
@RequiresApi(18)
public static io.grpc.binder.SecurityPolicy isDeviceOwner(Context applicationContext) {
DevicePolicyManager devicePolicyManager =
(DevicePolicyManager) applicationContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
Expand All @@ -199,7 +198,6 @@ public static io.grpc.binder.SecurityPolicy isDeviceOwner(Context applicationCon
* Creates {@link SecurityPolicy} which checks if the app is a profile owner app. See {@link
* DevicePolicyManager}.
*/
@RequiresApi(21)
public static SecurityPolicy isProfileOwner(Context applicationContext) {
DevicePolicyManager devicePolicyManager =
(DevicePolicyManager) applicationContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
Expand Down
21 changes: 12 additions & 9 deletions binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,18 +193,21 @@ private static Status bindInternal(
bindResult = context.bindService(bindIntent, conn, flags);
break;
case BIND_SERVICE_AS_USER:
bindResult = context.bindServiceAsUser(bindIntent, conn, flags, targetUserHandle);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
Copy link
Contributor

@kannanjgithub kannanjgithub Jul 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is going to fail the connection with Unimplemented for Android API levels 21 - 29. It would already be crashing for these API levels? @ejona86 . Also for similar changes below.

bindResult = context.bindServiceAsUser(bindIntent, conn, flags, targetUserHandle);
}
break;
case DEVICE_POLICY_BIND_SEVICE_ADMIN:
DevicePolicyManager devicePolicyManager =
(DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
bindResult =
devicePolicyManager.bindDeviceAdminServiceAsUser(
channelCredentials.getDevicePolicyAdminComponentName(),
bindIntent,
conn,
flags,
targetUserHandle);
(DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
bindResult = devicePolicyManager.bindDeviceAdminServiceAsUser(
channelCredentials.getDevicePolicyAdminComponentName(),
bindIntent,
conn,
flags,
targetUserHandle);
}
break;
}
if (!bindResult) {
Expand Down
4 changes: 4 additions & 0 deletions lint.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
<issue id="OldTargetApi" severity="ignore" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it cause any problem if you set targetSdkVersion to the latest available even while the AGP is not upgraded yet?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it causes AAPT2 linking failures due to resource format changes. AGP 7.x is incompatible with SDK 35/36, so AGP must be upgraded first. keeping the lint.xml suppression after upgrading AGP/SDK won’t break anything, and have to remove it after the AGP/SDK upgrade to keep our configuration clean.

</lint>