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

Commit 2e586343 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge "New BLUETOOTH_ADVERTISE manifest permission." into sc-dev am: 76277193 

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

Change-Id: I60b159d8ebf1e72a4b92769845a659d3dc24c4ae
parents 150ce3b2 76277193

core/api/current.txt

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

    field public static final String BLUETOOTH = "android.permission.BLUETOOTH";

    field public static final String BLUETOOTH_ADMIN = "android.permission.BLUETOOTH_ADMIN";

    field public static final String BLUETOOTH_ADVERTISE = "android.permission.BLUETOOTH_ADVERTISE";

    field public static final String BLUETOOTH_CONNECT = "android.permission.BLUETOOTH_CONNECT";

    field public static final String BLUETOOTH_PRIVILEGED = "android.permission.BLUETOOTH_PRIVILEGED";

    field public static final String BLUETOOTH_SCAN = "android.permission.BLUETOOTH_SCAN";

core/java/android/app/AppOpsManager.java

+18 −5
Original line number Diff line number Diff line
@@ -1076,6 +1076,8 @@ public class AppOpsManager { 
    public static final int OP_BLUETOOTH_SCAN = AppProtoEnums.APP_OP_BLUETOOTH_SCAN;

    /** @hide */

    public static final int OP_BLUETOOTH_CONNECT = AppProtoEnums.APP_OP_BLUETOOTH_CONNECT;

    /** @hide */

    public static final int OP_BLUETOOTH_ADVERTISE = AppProtoEnums.APP_OP_BLUETOOTH_ADVERTISE;

    /** @hide Use the BiometricPrompt/BiometricManager APIs. */

    public static final int OP_USE_BIOMETRIC = AppProtoEnums.APP_OP_USE_BIOMETRIC;

    /** @hide Physical activity recognition. */
@@ -1237,7 +1239,7 @@ public class AppOpsManager { 


    /** @hide */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public static final int _NUM_OP = 114;

    public static final int _NUM_OP = 115;



    /** Access to coarse location information. */

    public static final String OPSTR_COARSE_LOCATION = "android:coarse_location";
@@ -1483,6 +1485,8 @@ public class AppOpsManager { 
    public static final String OPSTR_BLUETOOTH_SCAN = "android:bluetooth_scan";

    /** @hide */

    public static final String OPSTR_BLUETOOTH_CONNECT = "android:bluetooth_connect";

    /** @hide */

    public static final String OPSTR_BLUETOOTH_ADVERTISE = "android:bluetooth_advertise";



    /** @hide Use the BiometricPrompt/BiometricManager APIs. */

    public static final String OPSTR_USE_BIOMETRIC = "android:use_biometric";
@@ -1733,6 +1737,7 @@ public class AppOpsManager { 
            // Nearby devices

            OP_BLUETOOTH_SCAN,

            OP_BLUETOOTH_CONNECT,

            OP_BLUETOOTH_ADVERTISE,

            OP_UWB_RANGING,



            // APPOP PERMISSIONS
@@ -1875,7 +1880,8 @@ public class AppOpsManager { 
            OP_MANAGE_MEDIA,                    // MANAGE_MEDIA

            OP_BLUETOOTH_CONNECT,               // OP_BLUETOOTH_CONNECT

            OP_UWB_RANGING,                     // OP_UWB_RANGING

            OP_ACTIVITY_RECOGNITION_SOURCE      // OP_ACTIVITY_RECOGNITION_SOURCE

            OP_ACTIVITY_RECOGNITION_SOURCE,     // OP_ACTIVITY_RECOGNITION_SOURCE

            OP_BLUETOOTH_ADVERTISE,             // OP_BLUETOOTH_ADVERTISE

    };



    /**
@@ -1995,7 +2001,8 @@ public class AppOpsManager { 
            OPSTR_MANAGE_MEDIA,

            OPSTR_BLUETOOTH_CONNECT,

            OPSTR_UWB_RANGING,

            OPSTR_ACTIVITY_RECOGNITION_SOURCE

            OPSTR_ACTIVITY_RECOGNITION_SOURCE,

            OPSTR_BLUETOOTH_ADVERTISE,

    };



    /**
@@ -2116,7 +2123,8 @@ public class AppOpsManager { 
            "MANAGE_MEDIA",

            "BLUETOOTH_CONNECT",

            "UWB_RANGING",

            "ACTIVITY_RECOGNITION_SOURCE"

            "ACTIVITY_RECOGNITION_SOURCE",

            "BLUETOOTH_ADVERTISE",

    };



    /**
@@ -2239,6 +2247,7 @@ public class AppOpsManager { 
            Manifest.permission.BLUETOOTH_CONNECT,

            Manifest.permission.UWB_RANGING,

            null, // no permission for OP_ACTIVITY_RECOGNITION_SOURCE,

            Manifest.permission.BLUETOOTH_ADVERTISE,

    };



    /**
@@ -2361,6 +2370,7 @@ public class AppOpsManager { 
            null, // BLUETOOTH_CONNECT

            null, // UWB_RANGING

            null, // ACTIVITY_RECOGNITION_SOURCE

            null, // BLUETOOTH_ADVERTISE

    };



    /**
@@ -2481,7 +2491,8 @@ public class AppOpsManager { 
            null, // MANAGE_MEDIA

            null, // BLUETOOTH_CONNECT

            null, // UWB_RANGING

            null  // ACTIVITY_RECOGNITION_SOURCE

            null, // ACTIVITY_RECOGNITION_SOURCE

            null, // BLUETOOTH_ADVERTISE

    };



    /**
@@ -2602,6 +2613,7 @@ public class AppOpsManager { 
            AppOpsManager.MODE_ALLOWED, // BLUETOOTH_CONNECT

            AppOpsManager.MODE_ALLOWED, // UWB_RANGING

            AppOpsManager.MODE_ALLOWED, // ACTIVITY_RECOGNITION_SOURCE

            AppOpsManager.MODE_ALLOWED, // BLUETOOTH_ADVERTISE

    };



    /**
@@ -2726,6 +2738,7 @@ public class AppOpsManager { 
            false, // BLUETOOTH_CONNECT

            false, // UWB_RANGING

            false, // ACTIVITY_RECOGNITION_SOURCE

            false, // BLUETOOTH_ADVERTISE

    };



    /**

core/res/AndroidManifest.xml

+9 −1
Original line number Diff line number Diff line
@@ -1953,7 +1953,15 @@ 
        android:label="@string/permlab_bluetooth_connect"

        android:protectionLevel="dangerous" />



    <!-- Required to be able to range to devices using uwb.

    <!-- Required to be able to advertise to nearby Bluetooth devices.

         <p>Protection level: dangerous -->

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

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:description="@string/permdesc_bluetooth_advertise"

        android:label="@string/permlab_bluetooth_advertise"

        android:protectionLevel="dangerous" />



    <!-- Required to be able to range to devices using ultra-wideband.

         <p>Protection level: dangerous -->

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

        android:permissionGroup="android.permission-group.UNDEFINED"

core/res/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -1484,6 +1484,10 @@ 
    <string name="permlab_bluetooth_connect">connect to paired Bluetooth 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_bluetooth_connect" product="default">Allows the app to connect to paired Bluetooth 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_bluetooth_advertise">advertise to nearby Bluetooth 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_bluetooth_advertise" product="default">Allows the app to advertise to nearby Bluetooth 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_uwb_ranging">determine relative position between nearby Ultra-Wideband devices</string>

core/tests/bluetoothtests/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


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

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

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

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

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

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