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

Commit d7d02609 authored by Brian Delwiche's avatar Brian Delwiche Committed by Android (Google) Code Review
Browse files

Merge "Fix permission bypasses to multiple methods" into tm-dev

parents 62944f39 ed63d97f

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

+16 −16
Original line number Diff line number Diff line
@@ -462,9 +462,9 @@ public final class Utils { 
            AttributionSource attributionSource, String message) {

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

        // attributionSource.enforceCallingUid();

        AttributionSource currentAttribution = new AttributionSource

                .Builder(context.getAttributionSource())

                .setNext(attributionSource)

        AttributionSource currentAttribution =

                new AttributionSource.Builder(context.getAttributionSource())

                        .setNext(Objects.requireNonNull(attributionSource))

                        .build();

        PermissionManager pm = context.getSystemService(PermissionManager.class);

        if (pm == null) {
@@ -711,9 +711,9 @@ public final class Utils { 
            Log.e(TAG, "Permission denial: Location is off.");

            return false;

        }

        AttributionSource currentAttribution = new AttributionSource

                .Builder(context.getAttributionSource())

                .setNext(attributionSource)

        AttributionSource currentAttribution =

                new AttributionSource.Builder(context.getAttributionSource())

                        .setNext(Objects.requireNonNull(attributionSource))

                        .build();

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

        // attributionSource.enforceCallingUid();
@@ -745,9 +745,9 @@ public final class Utils { 
            return false;

        }



        final AttributionSource currentAttribution = new AttributionSource

                .Builder(context.getAttributionSource())

                .setNext(attributionSource)

        final AttributionSource currentAttribution =

                new AttributionSource.Builder(context.getAttributionSource())

                        .setNext(Objects.requireNonNull(attributionSource))

                        .build();

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

        // attributionSource.enforceCallingUid();
@@ -783,9 +783,9 @@ public final class Utils { 
            return false;

        }



        AttributionSource currentAttribution = new AttributionSource

                .Builder(context.getAttributionSource())

                .setNext(attributionSource)

        AttributionSource currentAttribution =

                new AttributionSource.Builder(context.getAttributionSource())

                        .setNext(Objects.requireNonNull(attributionSource))

                        .build();

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

        // attributionSource.enforceCallingUid();