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

Commit 3eb30d1b authored by Oscar Shu's avatar Oscar Shu Committed by Automerger Merge Worker
Browse files

Merge changes from topic "nearbyWifi" am: 5b4121cb am: b437d7d8 am: d179f2e7 am: c8f667a1 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1864986

Change-Id: Icaf603145da0599c7b26d731764b28ead74b6da3
parents 1ad8a607 c8f667a1

services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java

+1 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ final class DefaultPermissionGrantPolicy { 
        NEARBY_DEVICES_PERMISSIONS.add(Manifest.permission.BLUETOOTH_CONNECT);

        NEARBY_DEVICES_PERMISSIONS.add(Manifest.permission.BLUETOOTH_SCAN);

        NEARBY_DEVICES_PERMISSIONS.add(Manifest.permission.UWB_RANGING);

        NEARBY_DEVICES_PERMISSIONS.add(Manifest.permission.NEARBY_WIFI_DEVICES);

    }



    private static final int MSG_READ_DEFAULT_PERMISSION_EXCEPTIONS = 1;