diff options
| author | Kevin Chyn <kchyn@google.com> | 2018-09-21 16:50:32 -0700 |
|---|---|---|
| committer | Kevin Chyn <kchyn@google.com> | 2018-09-21 17:08:54 -0700 |
| commit | b3c05aaa4f932bad130ee7467310d1582fceacad (patch) | |
| tree | e7b555e9aa501d537454eae51bbba36b1a855cf7 /core/java/android | |
| parent | 05c21508fd20f12e4b0a6ec6a6bd6f3910951e90 (diff) | |
Rename OP_USE_FACE to OP_USE_BIOMETRIC
All future biometrics share the same USE_BIOMETRIC permission.
Bug: 116340012
Test: BiometricPromptDemo works
Change-Id: I6e5af4d6dc1b467e67957c0aec90f6c0a67028a7
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/AppOpsManager.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index fd92174a8023..9c47e795c81d 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -429,8 +429,8 @@ public class AppOpsManager { /** @hide */ @UnsupportedAppUsage public static final int OP_BLUETOOTH_SCAN = 77; - /** @hide Use the face authentication API. */ - public static final int OP_USE_FACE = 78; + /** @hide Use the BiometricPrompt/BiometricManager APIs. */ + public static final int OP_USE_BIOMETRIC = 78; /** @hide */ @UnsupportedAppUsage public static final int _NUM_OP = 79; @@ -678,8 +678,8 @@ public class AppOpsManager { /** @hide */ public static final String OPSTR_BLUETOOTH_SCAN = "android:bluetooth_scan"; - /** @hide Use the face authentication API. */ - public static final String OPSTR_USE_FACE = "android:use_face"; + /** @hide Use the BiometricPrompt/BiometricManager APIs. */ + public static final String OPSTR_USE_BIOMETRIC = "android:use_biometric"; // Warning: If an permission is added here it also has to be added to // com.android.packageinstaller.permission.utils.EventLogger @@ -818,7 +818,7 @@ public class AppOpsManager { OP_MANAGE_IPSEC_TUNNELS, // MANAGE_IPSEC_HANDOVERS OP_START_FOREGROUND, // START_FOREGROUND OP_COARSE_LOCATION, // BLUETOOTH_SCAN - OP_USE_FACE, // FACE + OP_USE_BIOMETRIC, // BIOMETRIC }; /** @@ -903,7 +903,7 @@ public class AppOpsManager { OPSTR_MANAGE_IPSEC_TUNNELS, OPSTR_START_FOREGROUND, OPSTR_BLUETOOTH_SCAN, - OPSTR_USE_FACE, + OPSTR_USE_BIOMETRIC, }; /** @@ -989,7 +989,7 @@ public class AppOpsManager { "MANAGE_IPSEC_TUNNELS", "START_FOREGROUND", "BLUETOOTH_SCAN", - "USE_FACE", + "USE_BIOMETRIC", }; /** @@ -1163,7 +1163,7 @@ public class AppOpsManager { null, // MANAGE_IPSEC_TUNNELS null, // START_FOREGROUND null, // maybe should be UserManager.DISALLOW_SHARE_LOCATION, //BLUETOOTH_SCAN - null, // USE_FACE + null, // USE_BIOMETRIC }; /** @@ -1249,7 +1249,7 @@ public class AppOpsManager { false, // MANAGE_IPSEC_HANDOVERS false, // START_FOREGROUND true, // BLUETOOTH_SCAN - false, // USE_FACE + false, // USE_BIOMETRIC }; /** @@ -1334,7 +1334,7 @@ public class AppOpsManager { AppOpsManager.MODE_ERRORED, // MANAGE_IPSEC_TUNNELS AppOpsManager.MODE_ALLOWED, // OP_START_FOREGROUND AppOpsManager.MODE_ALLOWED, // OP_BLUETOOTH_SCAN - AppOpsManager.MODE_ALLOWED, // USE_FACE + AppOpsManager.MODE_ALLOWED, // USE_BIOMETRIC }; /** @@ -1423,7 +1423,7 @@ public class AppOpsManager { false, // MANAGE_IPSEC_TUNNELS false, // START_FOREGROUND false, // BLUETOOTH_SCAN - false, // USE_FACE + false, // USE_BIOMETRIC }; /** |