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

Commit 2b80ebcd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "usermanager(api): Flag nfc user restriction added for Android V" into main am: 98dc75f3 

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



Change-Id: I9c26d1942f56cd49be425c7d1dbb2df47e5afe24
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 64fcc2a2 98dc75f3

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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";

core/java/android/nfc/flags.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -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"

}

core/java/android/os/UserManager.java

+3 −0
Original line number Diff line number Diff line
@@ -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";