diff options
| author | Nicolas Prevot <nprevot@google.com> | 2015-06-22 23:18:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-22 23:18:32 +0000 |
| commit | 3ab6f9e691fac6eeea1af8fb35bd4c41cdd692ca (patch) | |
| tree | f4b3d72352beb8d8c8bc27ab68d7ed47a3bd5ae4 /api/current.txt | |
| parent | 2928f184b9789dc1f9609945a6f102d9eeaee6da (diff) | |
| parent | 9edbda18df025527e18614cf0c45d538a27af30f (diff) | |
| download | frameworks_base-3ab6f9e691fac6eeea1af8fb35bd4c41cdd692ca.zip frameworks_base-3ab6f9e691fac6eeea1af8fb35bd4c41cdd692ca.tar.gz frameworks_base-3ab6f9e691fac6eeea1af8fb35bd4c41cdd692ca.tar.bz2 | |
Merge "Allow cross-profile app linking from work to personal." into mnc-dev
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 1287c74..457a9e8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -23663,6 +23663,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 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"; |