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

Commit 2c4f8949 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27235142']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27235142'] into security-aosp-sc-v2-release.

Change-Id: I5fbe6b51abbfb3c1620e3471e25b7c92da061035
parents a9a63751 a82c33e2

src/com/android/bluetooth/Utils.java

+11 −5
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ import java.nio.charset.CharsetDecoder; 
import java.time.Instant;

import java.time.ZoneId;

import java.time.format.DateTimeFormatter;

import java.util.Objects;

import java.util.UUID;

import java.util.concurrent.TimeUnit;
@@ -451,7 +452,8 @@ public final class Utils { 
        // attributionSource.enforceCallingUid();

        final int result = PermissionChecker.checkPermissionForDataDeliveryFromDataSource(

                context, permission, PID_UNKNOWN,

                new AttributionSource(context.getAttributionSource(), attributionSource), message);

                new AttributionSource(context.getAttributionSource(),

                                      Objects.requireNonNull(attributionSource)), message);

        if (result == PERMISSION_GRANTED) {

            return true;

        }
@@ -693,7 +695,8 @@ public final class Utils { 
        // attributionSource.enforceCallingUid();

        if (PermissionChecker.checkPermissionForDataDeliveryFromDataSource(

                context, ACCESS_COARSE_LOCATION, PID_UNKNOWN,

                new AttributionSource(context.getAttributionSource(), attributionSource),

                new AttributionSource(context.getAttributionSource(),

                                      Objects.requireNonNull(attributionSource)),

                "Bluetooth location check") == PERMISSION_GRANTED) {

            return true;

        }
@@ -721,14 +724,16 @@ public final class Utils { 
        // attributionSource.enforceCallingUid();

        if (PermissionChecker.checkPermissionForDataDeliveryFromDataSource(

                context, ACCESS_FINE_LOCATION, PID_UNKNOWN,

                new AttributionSource(context.getAttributionSource(), attributionSource),

                new AttributionSource(context.getAttributionSource(),

                                      Objects.requireNonNull(attributionSource)),

                "Bluetooth location check") == PERMISSION_GRANTED) {

            return true;

        }



        if (PermissionChecker.checkPermissionForDataDeliveryFromDataSource(

                context, ACCESS_COARSE_LOCATION, PID_UNKNOWN,

                new AttributionSource(context.getAttributionSource(), attributionSource),

                new AttributionSource(context.getAttributionSource(),

                                      Objects.requireNonNull(attributionSource)),

                "Bluetooth location check") == PERMISSION_GRANTED) {

            return true;

        }
@@ -755,7 +760,8 @@ public final class Utils { 
        // attributionSource.enforceCallingUid();

        if (PermissionChecker.checkPermissionForDataDeliveryFromDataSource(

                context, ACCESS_FINE_LOCATION, PID_UNKNOWN,

                new AttributionSource(context.getAttributionSource(), attributionSource),

                new AttributionSource(context.getAttributionSource(),

                                      Objects.requireNonNull(attributionSource)),

                "Bluetooth location check") == PERMISSION_GRANTED) {

            return true;

        }