diff options
author | Nicolas Prevot <nprevot@google.com> | 2015-06-25 14:25:41 -0700 |
---|---|---|
committer | Nicolas Prevot <nprevot@google.com> | 2015-06-25 19:54:12 -0700 |
commit | f0029c1ddb2875583e62c6a3f96d288e21f2efe2 (patch) | |
tree | aaf784407eaab47af729b3e0e4686804c967c6dc /api | |
parent | 5869363b06dc81b83cff7e75ffd48559938915fc (diff) | |
download | frameworks_base-f0029c1ddb2875583e62c6a3f96d288e21f2efe2.zip frameworks_base-f0029c1ddb2875583e62c6a3f96d288e21f2efe2.tar.gz frameworks_base-f0029c1ddb2875583e62c6a3f96d288e21f2efe2.tar.bz2 |
Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING
Also improve the javadoc.
BUG:21701782
Change-Id: I88a75ccfa71b0d5df2f4779987cf0fff56001fd3
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 2 | ||||
-rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 63eafbc..5247a1d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -23666,7 +23666,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"; diff --git a/api/system-current.txt b/api/system-current.txt index b9d29a9..f4c25a5 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -25611,7 +25611,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"; |