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

Commit 03c5b0d9 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge "Temporarily disable security checks." into sc-dev am: 552c28ba 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/15260674

Change-Id: Icbad8cb8dd2bb47ad582831350590a579c42e2d1
parents 881557b0 552c28ba

src/com/android/bluetooth/Utils.java

+8 −4
Original line number Diff line number Diff line
@@ -447,7 +447,8 @@ public final class Utils { 
    @SuppressLint("AndroidFrameworkRequiresPermission")

    private static boolean checkPermissionForDataDelivery(Context context, String permission,

            AttributionSource attributionSource, String message) {

        attributionSource.enforceCallingUid();

        // STOPSHIP(b/188391719): enable this security enforcement

        // attributionSource.enforceCallingUid();

        final int result = PermissionChecker.checkPermissionForDataDeliveryFromDataSource(

                context, permission, PID_UNKNOWN,

                new AttributionSource(context.getAttributionSource(), attributionSource), message);
@@ -688,7 +689,8 @@ public final class Utils { 
            return false;

        }



        attributionSource.enforceCallingUid();

        // STOPSHIP(b/188391719): enable this security enforcement

        // attributionSource.enforceCallingUid();

        if (PermissionChecker.checkPermissionForDataDeliveryFromDataSource(

                context, ACCESS_COARSE_LOCATION, PID_UNKNOWN,

                new AttributionSource(context.getAttributionSource(), attributionSource),
@@ -715,7 +717,8 @@ public final class Utils { 
            return false;

        }



        attributionSource.enforceCallingUid();

        // STOPSHIP(b/188391719): enable this security enforcement

        // attributionSource.enforceCallingUid();

        if (PermissionChecker.checkPermissionForDataDeliveryFromDataSource(

                context, ACCESS_FINE_LOCATION, PID_UNKNOWN,

                new AttributionSource(context.getAttributionSource(), attributionSource),
@@ -748,7 +751,8 @@ public final class Utils { 
            return false;

        }



        attributionSource.enforceCallingUid();

        // STOPSHIP(b/188391719): enable this security enforcement

        // attributionSource.enforceCallingUid();

        if (PermissionChecker.checkPermissionForDataDeliveryFromDataSource(

                context, ACCESS_FINE_LOCATION, PID_UNKNOWN,

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