diff options
| author | 2023-10-24 17:40:38 +0000 | |
|---|---|---|
| committer | 2023-10-24 17:40:38 +0000 | |
| commit | 98dc75f3fa7db61a2c5be87b3e7772e0637c5394 (patch) | |
| tree | e8af80a7a25de200bea5cfb716f99bda16cf1027 | |
| parent | ca0bc9350a7c00ca86801da441c8583e1527d21f (diff) | |
| parent | e183c0d433c0ac135aaa668317eec9b5be58686d (diff) | |
Merge "usermanager(api): Flag nfc user restriction added for Android V" into main
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/nfc/flags.aconfig | 7 | ||||
| -rw-r--r-- | core/java/android/os/UserManager.java | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 4c1d51d2e9d8..b1eaf3538878 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -33963,7 +33963,7 @@ package android.os { field public static final String DISALLOW_MICROPHONE_TOGGLE = "disallow_microphone_toggle"; field public static final String DISALLOW_MODIFY_ACCOUNTS = "no_modify_accounts"; field public static final String DISALLOW_MOUNT_PHYSICAL_MEDIA = "no_physical_media"; - field public static final String DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO = "no_near_field_communication_radio"; + field @FlaggedApi("android.nfc.enable_nfc_user_restriction") public static final String DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO = "no_near_field_communication_radio"; field public static final String DISALLOW_NETWORK_RESET = "no_network_reset"; field public static final String DISALLOW_OUTGOING_BEAM = "no_outgoing_beam"; field public static final String DISALLOW_OUTGOING_CALLS = "no_outgoing_calls"; diff --git a/core/java/android/nfc/flags.aconfig b/core/java/android/nfc/flags.aconfig index 55b0b4261763..cd50ace036de 100644 --- a/core/java/android/nfc/flags.aconfig +++ b/core/java/android/nfc/flags.aconfig @@ -13,3 +13,10 @@ flag { description: "Flag for NFC reader option API changes" bug: "291187960" } + +flag { + name: "enable_nfc_user_restriction" + namespace: "nfc" + description: "Flag for NFC user restriction" + bug: "291187960" +} diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 159394b2b776..bbfd5938774b 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -23,6 +23,7 @@ import android.Manifest; import android.accounts.AccountManager; import android.annotation.ColorInt; import android.annotation.DrawableRes; +import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; @@ -58,6 +59,7 @@ import android.graphics.BitmapFactory; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.location.LocationManager; +import android.nfc.Flags; import android.provider.Settings; import android.util.AndroidException; import android.util.ArraySet; @@ -1831,6 +1833,7 @@ public class UserManager { * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() */ + @FlaggedApi(Flags.FLAG_ENABLE_NFC_USER_RESTRICTION) public static final String DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO = "no_near_field_communication_radio"; |