Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add new wifi nearby devices app-ops am: b4933d744e am: e8a5bf3545 am: 0b632103df

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

Change-Id: I62eb2e26be2b95409d25362201eed9c2aa56270a
This commit is contained in:
xshu
2021-10-25 18:58:58 +00:00
committed by Automerger Merge Worker
parent f1703ffa6b 0b632103df
commit 44a90fb123
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/app/AppOpsManager.java
View File

@@ -1292,6 +1292,9 @@ public class AppOpsManager {
/** @hide */ /** @hide */
public static final int OP_UWB_RANGING = AppProtoEnums.APP_OP_UWB_RANGING; 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 * Activity recognition being accessed by an activity recognition source, which
* is a component that already has access since it is the one that detects * is a component that already has access since it is the one that detects
@@ -1312,7 +1315,7 @@ public class AppOpsManager {
/** @hide */ /** @hide */
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @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. */ /** Access to coarse location information. */
public static final String OPSTR_COARSE_LOCATION = "android:coarse_location"; 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"; public static final String OPSTR_MANAGE_MEDIA = "android:manage_media";
/** @hide */ /** @hide */
public static final String OPSTR_UWB_RANGING = "android:uwb_ranging"; 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 * Activity recognition being accessed by an activity recognition source, which
@@ -1819,6 +1824,7 @@ public class AppOpsManager {
OP_BLUETOOTH_CONNECT, OP_BLUETOOTH_CONNECT,
OP_BLUETOOTH_ADVERTISE, OP_BLUETOOTH_ADVERTISE,
OP_UWB_RANGING, OP_UWB_RANGING,
OP_NEARBY_WIFI_DEVICES,
// APPOP PERMISSIONS // APPOP PERMISSIONS
OP_ACCESS_NOTIFICATIONS, OP_ACCESS_NOTIFICATIONS,
@@ -1963,6 +1969,7 @@ public class AppOpsManager {
OP_ACTIVITY_RECOGNITION, // OP_ACTIVITY_RECOGNITION_SOURCE OP_ACTIVITY_RECOGNITION, // OP_ACTIVITY_RECOGNITION_SOURCE
OP_BLUETOOTH_ADVERTISE, // OP_BLUETOOTH_ADVERTISE OP_BLUETOOTH_ADVERTISE, // OP_BLUETOOTH_ADVERTISE
OP_RECORD_INCOMING_PHONE_AUDIO, // OP_RECORD_INCOMING_PHONE_AUDIO 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_ACTIVITY_RECOGNITION_SOURCE,
OPSTR_BLUETOOTH_ADVERTISE, OPSTR_BLUETOOTH_ADVERTISE,
OPSTR_RECORD_INCOMING_PHONE_AUDIO, OPSTR_RECORD_INCOMING_PHONE_AUDIO,
OPSTR_NEARBY_WIFI_DEVICES,
}; };
/** /**
@@ -2208,6 +2216,7 @@ public class AppOpsManager {
"ACTIVITY_RECOGNITION_SOURCE", "ACTIVITY_RECOGNITION_SOURCE",
"BLUETOOTH_ADVERTISE", "BLUETOOTH_ADVERTISE",
"RECORD_INCOMING_PHONE_AUDIO", "RECORD_INCOMING_PHONE_AUDIO",
"NEARBY_WIFI_DEVICES"
}; };
/** /**
@@ -2332,6 +2341,7 @@ public class AppOpsManager {
null, // no permission for OP_ACTIVITY_RECOGNITION_SOURCE, null, // no permission for OP_ACTIVITY_RECOGNITION_SOURCE,
Manifest.permission.BLUETOOTH_ADVERTISE, Manifest.permission.BLUETOOTH_ADVERTISE,
null, // no permission for OP_RECORD_INCOMING_PHONE_AUDIO, 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, // ACTIVITY_RECOGNITION_SOURCE
null, // BLUETOOTH_ADVERTISE null, // BLUETOOTH_ADVERTISE
null, // RECORD_INCOMING_PHONE_AUDIO null, // RECORD_INCOMING_PHONE_AUDIO
null, // NEARBY_WIFI_DEVICES
}; };
/** /**
@@ -2579,6 +2590,7 @@ public class AppOpsManager {
null, // ACTIVITY_RECOGNITION_SOURCE null, // ACTIVITY_RECOGNITION_SOURCE
null, // BLUETOOTH_ADVERTISE null, // BLUETOOTH_ADVERTISE
null, // RECORD_INCOMING_PHONE_AUDIO 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, // ACTIVITY_RECOGNITION_SOURCE
AppOpsManager.MODE_ALLOWED, // BLUETOOTH_ADVERTISE AppOpsManager.MODE_ALLOWED, // BLUETOOTH_ADVERTISE
AppOpsManager.MODE_ALLOWED, // RECORD_INCOMING_PHONE_AUDIO 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, // ACTIVITY_RECOGNITION_SOURCE
false, // BLUETOOTH_ADVERTISE false, // BLUETOOTH_ADVERTISE
false, // RECORD_INCOMING_PHONE_AUDIO false, // RECORD_INCOMING_PHONE_AUDIO
false, // NEARBY_WIFI_DEVICES
}; };
/** /**