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

Commit 82e8d961 authored by xshu's avatar xshu Committed by Automerger Merge Worker
Browse files

New runtime permission NEARBY_WIFI_DEVICES am: a8395ffa

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

Change-Id: Ibc3123e53fee9caf3b1ade8159c5becf8a9f7cfc
parents 292fcb94 a8395ffa
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ package android {
    field public static final String MODIFY_PHONE_STATE = "android.permission.MODIFY_PHONE_STATE";
    field public static final String MOUNT_FORMAT_FILESYSTEMS = "android.permission.MOUNT_FORMAT_FILESYSTEMS";
    field public static final String MOUNT_UNMOUNT_FILESYSTEMS = "android.permission.MOUNT_UNMOUNT_FILESYSTEMS";
    field public static final String NEARBY_WIFI_DEVICES = "android.permission.NEARBY_WIFI_DEVICES";
    field public static final String NFC = "android.permission.NFC";
    field public static final String NFC_PREFERRED_PAYMENT_INFO = "android.permission.NFC_PREFERRED_PAYMENT_INFO";
    field public static final String NFC_TRANSACTION_EVENT = "android.permission.NFC_TRANSACTION_EVENT";
+8 −0
Original line number Diff line number Diff line
@@ -1976,6 +1976,14 @@
        android:label="@string/permlab_uwb_ranging"
        android:protectionLevel="dangerous" />

    <!-- Required to be able to advertise and connect to nearby devices via Wi-Fi.
         <p>Protection level: dangerous -->
    <permission android:name="android.permission.NEARBY_WIFI_DEVICES"
                android:permissionGroup="android.permission-group.UNDEFINED"
                android:description="@string/permdesc_nearby_wifi_devices"
                android:label="@string/permlab_nearby_wifi_devices"
                android:protectionLevel="dangerous" />

    <!-- @SystemApi @TestApi Allows an application to suspend other apps, which will prevent the
         user from using them until they are unsuspended.
         @hide
+5 −0
Original line number Diff line number Diff line
@@ -1488,6 +1488,11 @@
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=120]-->
    <string name="permdesc_uwb_ranging">Allow the app to determine relative position between nearby Ultra-Wideband devices</string>

    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=50]-->
    <string name="permlab_nearby_wifi_devices">interact with nearby Wi\u2011Fi devices</string>
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=120]-->
    <string name="permdesc_nearby_wifi_devices">Allows the app to advertise, connect, and determine the relative position of nearby Wi\u2011Fi devices</string>

    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
    <string name="permlab_preferredPaymentInfo">Preferred NFC Payment Service Information</string>
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->