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

Commit 4988378c authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by Android (Google) Code Review
Browse files

Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev

parents 75e51ec0 136a2e7f

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ package android { 
    field public static final java.lang.String OVERRIDE_WIFI_CONFIG = "android.permission.OVERRIDE_WIFI_CONFIG";

    field public static final java.lang.String PACKAGE_USAGE_STATS = "android.permission.PACKAGE_USAGE_STATS";

    field public static final java.lang.String PACKAGE_VERIFICATION_AGENT = "android.permission.PACKAGE_VERIFICATION_AGENT";

    field public static final java.lang.String PEERS_MAC_ADDRESS = "android.permission.PEERS_MAC_ADDRESS";

    field public static final java.lang.String PERFORM_CDMA_PROVISIONING = "android.permission.PERFORM_CDMA_PROVISIONING";

    field public static final java.lang.String PERFORM_SIM_ACTIVATION = "android.permission.PERFORM_SIM_ACTIVATION";

    field public static final deprecated java.lang.String PERSISTENT_ACTIVITY = "android.permission.PERSISTENT_ACTIVITY";

core/res/AndroidManifest.xml

+8 −4
Original line number Diff line number Diff line
@@ -961,9 +961,7 @@ 
        android:label="@string/permlab_changeWimaxState"

        android:protectionLevel="normal" />



    <!--@SystemApi Allows applications to the the local WiFi and Bluetooth MAC address.

        @hide

    -->

    <!-- Allows applications to act as network scorers. @hide @SystemApi-->

    <permission android:name="android.permission.SCORE_NETWORKS"

        android:protectionLevel="signature|privileged" />
@@ -2583,10 +2581,16 @@ 
    <permission android:name="android.permission.KILL_UID"

                android:protectionLevel="signature|installer" />



    <!-- Allows applications to act as network scorers. @hide @SystemApi-->

    <!-- @SystemApi Allows applications to read the local WiFi and Bluetooth MAC address.

        @hide -->

    <permission android:name="android.permission.LOCAL_MAC_ADDRESS"

                android:protectionLevel="signature|privileged" />



    <!-- @SystemApi Allows access to MAC addresses of WiFi and Bluetooth peer devices.

        @hide -->

    <permission android:name="android.permission.PEERS_MAC_ADDRESS"

                android:protectionLevel="signature" />



    <!-- Allows the Nfc stack to dispatch Nfc messages to applications. Applications

        can use this permission to ensure incoming Nfc messages are from the Nfc stack

        and not simulated by another application.

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
    <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />

    <uses-permission android:name="android.permission.READ_NETWORK_USAGE_HISTORY" />

    <uses-permission android:name="android.permission.CONTROL_VPN" />



    <uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>

    <!-- Physical hardware -->

    <uses-permission android:name="android.permission.MANAGE_USB" />

    <uses-permission android:name="android.permission.DEVICE_POWER" />