Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
aapt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Android-smartphones
interesting_things
interesting-peoples
osm0sis
aapt
Commits
d7fcca95
Commit
d7fcca95
authored
10 years ago
by
Amith Yamasani
Committed by
Android (Google) Code Review
10 years ago
Browse files
Options
Downloads
Plain Diff
Merge "Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS" into lmp-dev
parents
264ea9c3
1d653272
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
api/current.txt
+1
-1
1 addition, 1 deletion
api/current.txt
core/java/android/content/pm/PackageManager.java
+10
-2
10 additions, 2 deletions
core/java/android/content/pm/PackageManager.java
with
11 additions
and
3 deletions
api/current.txt
+
1
−
1
View file @
d7fcca95
...
...
@@ -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_
PROFILE
S = "android.software.managed_
profile
s";
field public static final java.lang.String FEATURE_MANAGED_
USER
S = "android.software.managed_
user
s";
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";
This diff is collapsed.
Click to expand it.
core/java/android/content/pm/PackageManager.java
+
10
−
2
View file @
d7fcca95
...
...
@@ -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}:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment