diff options
| author | Nicolas Prevot <nprevot@google.com> | 2015-06-29 17:08:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-29 17:08:34 +0000 |
| commit | 6fd49936ae6b145cb2a9fe8b9ff75dcd79632daa (patch) | |
| tree | 901bc3c9c27bd70d4ff1b42d00b3c24367722160 /api/current.txt | |
| parent | cadf3969c313bd0e354157eef9e0bcc552cb0c8a (diff) | |
| parent | f0029c1ddb2875583e62c6a3f96d288e21f2efe2 (diff) | |
| download | frameworks_base-6fd49936ae6b145cb2a9fe8b9ff75dcd79632daa.zip frameworks_base-6fd49936ae6b145cb2a9fe8b9ff75dcd79632daa.tar.gz frameworks_base-6fd49936ae6b145cb2a9fe8b9ff75dcd79632daa.tar.bz2 | |
Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 1f10695..aae84e1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -23641,7 +23641,7 @@ package android.os { method public deprecated void setUserRestriction(java.lang.String, boolean); method public deprecated void setUserRestrictions(android.os.Bundle); method public deprecated void setUserRestrictions(android.os.Bundle, android.os.UserHandle); - field public static final java.lang.String ALLOW_PARENT_APP_LINKING = "allow_parent_app_linking"; + field public static final java.lang.String ALLOW_PARENT_PROFILE_APP_LINKING = "allow_parent_profile_app_linking"; field public static final java.lang.String DISALLOW_ADD_USER = "no_add_user"; field public static final java.lang.String DISALLOW_ADJUST_VOLUME = "no_adjust_volume"; field public static final java.lang.String DISALLOW_APPS_CONTROL = "no_control_apps"; |