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

Commit d7fcca95 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS" into lmp-dev

parents 264ea9c3 1d653272

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8905,7 +8905,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_LOCATION = "android.hardware.location";

    field public static final java.lang.String FEATURE_LOCATION_GPS = "android.hardware.location.gps";

    field public static final java.lang.String FEATURE_LOCATION_NETWORK = "android.hardware.location.network";

    field public static final java.lang.String FEATURE_MANAGED_PROFILES = "android.software.managed_profiles";

    field public static final java.lang.String FEATURE_MANAGED_USERS = "android.software.managed_users";

    field public static final java.lang.String FEATURE_MICROPHONE = "android.hardware.microphone";

    field public static final java.lang.String FEATURE_NFC = "android.hardware.nfc";

    field public static final java.lang.String FEATURE_NFC_HOST_CARD_EMULATION = "android.hardware.nfc.hce";

core/java/android/content/pm/PackageManager.java

+10 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.annotation.SdkConstant.SdkConstantType; 
import android.annotation.SystemApi;

import android.app.PackageDeleteObserver;

import android.app.PackageInstallObserver;

import android.app.admin.DevicePolicyManager;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;
@@ -1518,10 +1519,17 @@ public abstract class PackageManager { 


    /**

     * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:

     * The device supports managed profiles for enterprise users.

     * The device supports creating secondary users and managed profiles via

     * {@link DevicePolicyManager}.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_MANAGED_PROFILES = "android.software.managed_profiles";

    public static final String FEATURE_MANAGED_USERS = "android.software.managed_users";



    /**

     * @hide

     * TODO: Remove after dependencies updated b/17392243

     */

    public static final String FEATURE_MANAGED_PROFILES = "android.software.managed_users";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: