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

Commit b4933d74 authored by xshu's avatar xshu
Browse files

Add new wifi nearby devices app-ops 

(cherry-picked from internal master)
This will be part of nearby devices permission group

Bug: 197776854
Test: compiles
Change-Id: I6002edfd951322d959cd8f4c7a06381badfd1660
Merged-In: I6002edfd951322d959cd8f4c7a06381badfd1660
parent a8395ffa

core/java/android/app/AppOpsManager.java

+15 −1
Original line number Diff line number Diff line
@@ -1292,6 +1292,9 @@ public class AppOpsManager { 
    /** @hide */

    public static final int OP_UWB_RANGING = AppProtoEnums.APP_OP_UWB_RANGING;



    /** @hide */

    public static final int OP_NEARBY_WIFI_DEVICES = AppProtoEnums.APP_OP_NEARBY_WIFI_DEVICES;



    /**

     * Activity recognition being accessed by an activity recognition source, which

     * is a component that already has access since it is the one that detects
@@ -1312,7 +1315,7 @@ public class AppOpsManager { 


    /** @hide */

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

    public static final int _NUM_OP = 116;

    public static final int _NUM_OP = 117;



    /** Access to coarse location information. */

    public static final String OPSTR_COARSE_LOCATION = "android:coarse_location";
@@ -1731,6 +1734,8 @@ public class AppOpsManager { 
    public static final String OPSTR_MANAGE_MEDIA = "android:manage_media";

    /** @hide */

    public static final String OPSTR_UWB_RANGING = "android:uwb_ranging";

    /** @hide */

    public static final String OPSTR_NEARBY_WIFI_DEVICES = "android:nearby_wifi_devices";



    /**

     * Activity recognition being accessed by an activity recognition source, which
@@ -1819,6 +1824,7 @@ public class AppOpsManager { 
            OP_BLUETOOTH_CONNECT,

            OP_BLUETOOTH_ADVERTISE,

            OP_UWB_RANGING,

            OP_NEARBY_WIFI_DEVICES,



            // APPOP PERMISSIONS

            OP_ACCESS_NOTIFICATIONS,
@@ -1963,6 +1969,7 @@ public class AppOpsManager { 
            OP_ACTIVITY_RECOGNITION,            // OP_ACTIVITY_RECOGNITION_SOURCE

            OP_BLUETOOTH_ADVERTISE,             // OP_BLUETOOTH_ADVERTISE

            OP_RECORD_INCOMING_PHONE_AUDIO,     // OP_RECORD_INCOMING_PHONE_AUDIO

            OP_NEARBY_WIFI_DEVICES,             // OP_NEARBY_WIFI_DEVICES

    };



    /**
@@ -2085,6 +2092,7 @@ public class AppOpsManager { 
            OPSTR_ACTIVITY_RECOGNITION_SOURCE,

            OPSTR_BLUETOOTH_ADVERTISE,

            OPSTR_RECORD_INCOMING_PHONE_AUDIO,

            OPSTR_NEARBY_WIFI_DEVICES,

    };



    /**
@@ -2208,6 +2216,7 @@ public class AppOpsManager { 
            "ACTIVITY_RECOGNITION_SOURCE",

            "BLUETOOTH_ADVERTISE",

            "RECORD_INCOMING_PHONE_AUDIO",

            "NEARBY_WIFI_DEVICES"

    };



    /**
@@ -2332,6 +2341,7 @@ public class AppOpsManager { 
            null, // no permission for OP_ACTIVITY_RECOGNITION_SOURCE,

            Manifest.permission.BLUETOOTH_ADVERTISE,

            null, // no permission for OP_RECORD_INCOMING_PHONE_AUDIO,

            Manifest.permission.NEARBY_WIFI_DEVICES,

    };



    /**
@@ -2456,6 +2466,7 @@ public class AppOpsManager { 
            null, // ACTIVITY_RECOGNITION_SOURCE

            null, // BLUETOOTH_ADVERTISE

            null, // RECORD_INCOMING_PHONE_AUDIO

            null, // NEARBY_WIFI_DEVICES

    };



    /**
@@ -2579,6 +2590,7 @@ public class AppOpsManager { 
            null, // ACTIVITY_RECOGNITION_SOURCE

            null, // BLUETOOTH_ADVERTISE

            null, // RECORD_INCOMING_PHONE_AUDIO

            null, // NEARBY_WIFI_DEVICES

    };



    /**
@@ -2701,6 +2713,7 @@ public class AppOpsManager { 
            AppOpsManager.MODE_ALLOWED, // ACTIVITY_RECOGNITION_SOURCE

            AppOpsManager.MODE_ALLOWED, // BLUETOOTH_ADVERTISE

            AppOpsManager.MODE_ALLOWED, // RECORD_INCOMING_PHONE_AUDIO

            AppOpsManager.MODE_ALLOWED, // NEARBY_WIFI_DEVICES

    };



    /**
@@ -2827,6 +2840,7 @@ public class AppOpsManager { 
            false, // ACTIVITY_RECOGNITION_SOURCE

            false, // BLUETOOTH_ADVERTISE

            false, // RECORD_INCOMING_PHONE_AUDIO

            false, // NEARBY_WIFI_DEVICES

    };



    /**