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

Commit 17cc1653 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: I67e781858a7050ec37b2887a167615345b1be952
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4cd310aa d7d02609

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

+16 −16
Original line number Original line Diff line number Diff line
@@ -467,9 +467,9 @@ public final class Utils { 
        }

        }

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

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

        // attributionSource.enforceCallingUid();

        // attributionSource.enforceCallingUid();

        AttributionSource currentAttribution = new AttributionSource

        AttributionSource currentAttribution =

                .Builder(context.getAttributionSource())

                new AttributionSource.Builder(context.getAttributionSource())

                .setNext(attributionSource)

                        .setNext(Objects.requireNonNull(attributionSource))

                        .build();

                        .build();

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

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

        if (pm == null) {

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

            Log.e(TAG, "Permission denial: Location is off.");

            return false;

            return false;

        }

        }

        AttributionSource currentAttribution = new AttributionSource

        AttributionSource currentAttribution =

                .Builder(context.getAttributionSource())

                new AttributionSource.Builder(context.getAttributionSource())

                .setNext(attributionSource)

                        .setNext(Objects.requireNonNull(attributionSource))

                        .build();

                        .build();

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

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

        // attributionSource.enforceCallingUid();

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

            return false;

        }

        }





        final AttributionSource currentAttribution = new AttributionSource

        final AttributionSource currentAttribution =

                .Builder(context.getAttributionSource())

                new AttributionSource.Builder(context.getAttributionSource())

                .setNext(attributionSource)

                        .setNext(Objects.requireNonNull(attributionSource))

                        .build();

                        .build();

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

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

        // attributionSource.enforceCallingUid();

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

            return false;

        }

        }





        AttributionSource currentAttribution = new AttributionSource

        AttributionSource currentAttribution =

                .Builder(context.getAttributionSource())

                new AttributionSource.Builder(context.getAttributionSource())

                .setNext(attributionSource)

                        .setNext(Objects.requireNonNull(attributionSource))

                        .build();

                        .build();

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

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

        // attributionSource.enforceCallingUid();

        // attributionSource.enforceCallingUid();