Skip to content

Commit 3f241f8

Browse files
committed
Android: worked on lint and build warnings
1 parent a16d655 commit 3f241f8

File tree

5 files changed

+20
-13
lines changed

5 files changed

+20
-13
lines changed

android/src/main/java/io/grpc/android/AndroidChannelBuilder.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ private void configureNetworkMonitoring() {
217217
connectivityManager.registerDefaultNetworkCallback(defaultNetworkCallback);
218218
unregisterRunnable =
219219
new Runnable() {
220-
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
221220
@Override
222221
public void run() {
223222
connectivityManager.unregisterNetworkCallback(defaultNetworkCallback);
@@ -231,7 +230,6 @@ public void run() {
231230
context.registerReceiver(networkReceiver, networkIntentFilter);
232231
unregisterRunnable =
233232
new Runnable() {
234-
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
235233
@Override
236234
public void run() {
237235
context.unregisterReceiver(networkReceiver);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static com.google.common.base.Preconditions.checkArgument;
2121
import static com.google.common.base.Preconditions.checkState;
2222

23+
import android.annotation.SuppressLint;
2324
import android.content.ComponentName;
2425
import android.content.Context;
2526
import android.content.Intent;
@@ -165,6 +166,7 @@ public Intent asBindIntent() {
165166
*
166167
* <p>See {@link Intent#URI_ANDROID_APP_SCHEME} for details.
167168
*/
169+
@SuppressLint("InlinedApi")
168170
public String asAndroidAppUri() {
169171
Intent intentForUri = bindIntent;
170172
if (intentForUri.getPackage() == null) {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ public Status checkAuthorization(int uid) {
184184
* Creates {@link SecurityPolicy} which checks if the app is a device owner app. See {@link
185185
* DevicePolicyManager}.
186186
*/
187-
@RequiresApi(18)
188187
public static io.grpc.binder.SecurityPolicy isDeviceOwner(Context applicationContext) {
189188
DevicePolicyManager devicePolicyManager =
190189
(DevicePolicyManager) applicationContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
@@ -199,7 +198,6 @@ public static io.grpc.binder.SecurityPolicy isDeviceOwner(Context applicationCon
199198
* Creates {@link SecurityPolicy} which checks if the app is a profile owner app. See {@link
200199
* DevicePolicyManager}.
201200
*/
202-
@RequiresApi(21)
203201
public static SecurityPolicy isProfileOwner(Context applicationContext) {
204202
DevicePolicyManager devicePolicyManager =
205203
(DevicePolicyManager) applicationContext.getSystemService(Context.DEVICE_POLICY_SERVICE);

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

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import android.content.Context;
2424
import android.content.Intent;
2525
import android.content.ServiceConnection;
26+
import android.os.Build;
2627
import android.os.IBinder;
2728
import android.os.UserHandle;
2829
import androidx.annotation.AnyThread;
@@ -183,18 +184,22 @@ private static Status bindInternal(
183184
bindResult = context.bindService(bindIntent, conn, flags);
184185
break;
185186
case BIND_SERVICE_AS_USER:
186-
bindResult = context.bindServiceAsUser(bindIntent, conn, flags, targetUserHandle);
187+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
188+
bindResult = context.bindServiceAsUser(bindIntent, conn, flags, targetUserHandle);
189+
}
187190
break;
188191
case DEVICE_POLICY_BIND_SEVICE_ADMIN:
189192
DevicePolicyManager devicePolicyManager =
190-
(DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
191-
bindResult =
192-
devicePolicyManager.bindDeviceAdminServiceAsUser(
193-
channelCredentials.getDevicePolicyAdminComponentName(),
194-
bindIntent,
195-
conn,
196-
flags,
197-
targetUserHandle);
193+
(DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
194+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
195+
bindResult =
196+
devicePolicyManager.bindDeviceAdminServiceAsUser(
197+
channelCredentials.getDevicePolicyAdminComponentName(),
198+
bindIntent,
199+
conn,
200+
flags,
201+
targetUserHandle);
202+
}
198203
break;
199204
}
200205
if (!bindResult) {

lint.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<lint>
3+
<issue id="OldTargetApi" severity="ignore" />
4+
</lint>

0 commit comments

Comments
 (0)