summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorEugene Susla <eugenesusla@google.com>2019-07-24 16:30:16 -0700
committerEugene Susla <eugenesusla@google.com>2019-12-19 12:04:05 -0800
commit1fa23ed08ac4c2113319097d03e30b558dd37698 (patch)
treec4a8384ecd429c0ee933ac9fc67058105821254a /core/java/android
parent0d2e2c2be0374fdf426212368ab2e593612bf151 (diff)
[CDM] Bypass location setting when scanning for devices
Fixes: 140524365 Test: turn off location in settings and ensure devices still shown in UI Change-Id: Ifea696c18977fc5e94d93ced4f5d8b916587d0ec
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/pm/PermissionInfo.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java
index c77c53f387e2..dffcc41cbbe6 100644
--- a/core/java/android/content/pm/PermissionInfo.java
+++ b/core/java/android/content/pm/PermissionInfo.java
@@ -248,6 +248,17 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
@TestApi
public static final int PROTECTION_FLAG_TELEPHONY = 0x400000;
+ /**
+ * Additional flag for {@link #protectionLevel}, corresponding
+ * to the <code>companion</code> value of
+ * {@link android.R.attr#protectionLevel}.
+ *
+ * @hide
+ */
+ @SystemApi
+ @TestApi
+ public static final int PROTECTION_FLAG_COMPANION = 0x800000;
+
/** @hide */
@IntDef(flag = true, prefix = { "PROTECTION_FLAG_" }, value = {
PROTECTION_FLAG_PRIVILEGED,
@@ -270,6 +281,7 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
PROTECTION_FLAG_INCIDENT_REPORT_APPROVER,
PROTECTION_FLAG_APP_PREDICTOR,
PROTECTION_FLAG_TELEPHONY,
+ PROTECTION_FLAG_COMPANION,
})
@Retention(RetentionPolicy.SOURCE)
public @interface ProtectionFlags {}