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

Commit 649dba3f authored by Mayank Garg's avatar Mayank Garg
Browse files

Revert "Enforce calling uid when using attribution source." 

This reverts commit 264143e8.

Reason for revert: breaking system UI for auto b/189350931 b/189317959

Bug: 188391719
Bug: 189350931
BUg: 189317959
Test: atest CtsPermissionTestCases:android.permission.cts.NearbyDevicesPermissionTest
Test: build & flash, check bluetooth works

Change-Id: I00234684a52cf4bdc72989e4fb8704981ad9e220
parent 264143e8

android/app/src/com/android/bluetooth/Utils.java

+0 −4
Original line number Diff line number Diff line
@@ -436,7 +436,6 @@ 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);
@@ -666,7 +665,6 @@ public final class Utils { 
            return false;

        }



        attributionSource.enforceCallingUid();

        if (PermissionChecker.checkPermissionForDataDeliveryFromDataSource(

                context, ACCESS_COARSE_LOCATION, PID_UNKNOWN,

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

        }



        attributionSource.enforceCallingUid();

        if (PermissionChecker.checkPermissionForDataDeliveryFromDataSource(

                context, ACCESS_FINE_LOCATION, PID_UNKNOWN,

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

        }



        attributionSource.enforceCallingUid();

        if (PermissionChecker.checkPermissionForDataDeliveryFromDataSource(

                context, ACCESS_FINE_LOCATION, PID_UNKNOWN,

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