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

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

Fix permission bypasses to multiple methods am: 5fe72f93 am: bc62f402 

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



Change-Id: I8ceed40e337ce361bb036ddaf0e457b432dc74e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1f63edb4 bc62f402

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

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

        // 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) {
@@ -809,9 +809,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();
@@ -843,9 +843,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();
@@ -881,9 +881,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();

android/app/tests/unit/src/com/android/bluetooth/UtilsTest.java

+9 −4
Original line number Diff line number Diff line
@@ -119,10 +119,12 @@ public class UtilsTest { 
        boolean enabledStatus = locationManager.isLocationEnabledForUser(userHandle);



        locationManager.setLocationEnabledForUser(false, userHandle);

        assertThat(Utils.checkCallerHasCoarseLocation(context, null, userHandle)).isFalse();

        assertThat(Utils.checkCallerHasCoarseLocation(

                       context, context.getAttributionSource(), userHandle))

                .isFalse();



        locationManager.setLocationEnabledForUser(true, userHandle);

        Utils.checkCallerHasCoarseLocation(context, null, userHandle);

        Utils.checkCallerHasCoarseLocation(context, context.getAttributionSource(), userHandle);

        if (!enabledStatus) {

            locationManager.setLocationEnabledForUser(false, userHandle);

        }
@@ -136,10 +138,13 @@ public class UtilsTest { 
        boolean enabledStatus = locationManager.isLocationEnabledForUser(userHandle);



        locationManager.setLocationEnabledForUser(false, userHandle);

        assertThat(Utils.checkCallerHasCoarseOrFineLocation(context, null, userHandle)).isFalse();

        assertThat(Utils.checkCallerHasCoarseOrFineLocation(

                       context, context.getAttributionSource(), userHandle))

                .isFalse();



        locationManager.setLocationEnabledForUser(true, userHandle);

        Utils.checkCallerHasCoarseOrFineLocation(context, null, userHandle);

        Utils.checkCallerHasCoarseOrFineLocation(

                context, context.getAttributionSource(), userHandle);

        if (!enabledStatus) {

            locationManager.setLocationEnabledForUser(false, userHandle);

        }