From 89b3b4a0b214eea12a5f48b61a021103cdc5c10e Mon Sep 17 00:00:00 2001 From: Adam Connors Date: Thu, 5 Jun 2014 12:13:03 +0100 Subject: API Review: rename FEATURE_MANAGEDPROFILES To be FEATURE_MANAGED_PROFILES Bug: 15025371 Change-Id: I2f818b4d8488fe7943fe5ff6051d6b1f84ca9e8c (cherry picked from commit 687efd6f5c05dc1e4a9c284bf3edae901af45942) --- api/current.txt | 2 +- core/java/android/content/pm/PackageManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index 4cae752cfaa6..0d38dc95780a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8368,7 +8368,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_MANAGEDPROFILES = "android.software.managedprofiles"; + field public static final java.lang.String FEATURE_MANAGED_PROFILES = "android.software.managed_profiles"; 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"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 35bcc027bd0f..aadb10ebad25 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1402,7 +1402,7 @@ public abstract class PackageManager { * The device supports managed profiles for enterprise users. */ @SdkConstant(SdkConstantType.FEATURE) - public static final String FEATURE_MANAGEDPROFILES = "android.software.managedprofiles"; + public static final String FEATURE_MANAGED_PROFILES = "android.software.managed_profiles"; /** * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: -- cgit v1.2.3-59-g8ed1b