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

Commit cd3183c3 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 am: c43708ed 

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



Change-Id: I115419c810ababbcebbc04e8c0b73690826710f4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3068bfb5 c43708ed

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

+16 −16
Original line number Original line Diff line number Diff line
@@ -466,9 +466,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) {
@@ -718,9 +718,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();
@@ -752,9 +752,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();
@@ -790,9 +790,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();