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

Commit c43708ed authored by Brian Delwiche's avatar Brian Delwiche Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: If797ac055ec32a21a1b9aef3a420270fc49a0ecc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d3d8bdb7 d7d02609

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();