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

Commit 9bbaadf9 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Revert "Revert "Enforce calling uid when using attribution source."" 

This reverts commit 8af1a9fc.

Bug: 188391719
Test: atest BluetoothInstrumentationTests
Change-Id: I9b4a7bb8bde9982541bf8737dc1800b4016e921f
parent 98257a26

src/com/android/bluetooth/Utils.java

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

    private static boolean checkPermissionForDataDelivery(Context context, String permission,

            AttributionSource attributionSource, String message) {

        attributionSource.enforceCallingUid();

        final int result = PermissionChecker.checkPermissionForDataDeliveryFromDataSource(

                context, permission, PID_UNKNOWN,

                new AttributionSource(context.getAttributionSource(), attributionSource), message);
@@ -665,6 +666,7 @@ public final class Utils { 
            return false;

        }



        attributionSource.enforceCallingUid();

        if (PermissionChecker.checkPermissionForDataDeliveryFromDataSource(

                context, ACCESS_COARSE_LOCATION, PID_UNKNOWN,

                new AttributionSource(context.getAttributionSource(), attributionSource),
@@ -691,6 +693,7 @@ public final class Utils { 
            return false;

        }



        attributionSource.enforceCallingUid();

        if (PermissionChecker.checkPermissionForDataDeliveryFromDataSource(

                context, ACCESS_FINE_LOCATION, PID_UNKNOWN,

                new AttributionSource(context.getAttributionSource(), attributionSource),
@@ -723,6 +726,7 @@ public final class Utils { 
            return false;

        }



        attributionSource.enforceCallingUid();

        if (PermissionChecker.checkPermissionForDataDeliveryFromDataSource(

                context, ACCESS_FINE_LOCATION, PID_UNKNOWN,

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