Skip to content

Commit bb4940e

Browse files
committed
add null check to hasUsbAccessoryPermission and checkPermission in Android Tools
1 parent 4314d9d commit bb4940e

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,9 @@ public static void saveVehicleType(Context context, VehicleType vehicleType, Str
398398
}
399399

400400
public static boolean hasUsbAccessoryPermission(Context context) {
401+
if (context == null) {
402+
return false;
403+
}
401404
UsbManager manager = (UsbManager) context.getSystemService(Context.USB_SERVICE);
402405
if (manager == null || manager.getAccessoryList() == null) {
403406
return false;
@@ -411,6 +414,9 @@ public static boolean hasUsbAccessoryPermission(Context context) {
411414
}
412415

413416
public static boolean checkPermission(Context applicationContext, String permission) {
417+
if (applicationContext == null) {
418+
return false;
419+
}
414420
return PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(applicationContext, permission);
415421
}
416422

0 commit comments

Comments
 (0)