Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9fb8ccf authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Defer null permission check to default device context" into main

parents 0105770f 30e3e686

core/java/android/permission/PermissionManager.java

+2 −2
Original line number Diff line number Diff line
@@ -2009,8 +2009,8 @@ public final class PermissionManager { 
     */

    public static int resolveDeviceIdForPermissionCheck(@NonNull Context context, int deviceId,

            @Nullable String permission) {

        if (deviceId == Context.DEVICE_ID_DEFAULT || !DEVICE_AWARE_PERMISSIONS.contains(

                permission)) {

        if (deviceId == Context.DEVICE_ID_DEFAULT || permission == null

                || !DEVICE_AWARE_PERMISSIONS.contains(permission)) {

            return Context.DEVICE_ID_DEFAULT;

        }