diff options
| author | Julia Reynolds <juliacr@google.com> | 2015-04-28 15:14:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-28 15:14:32 +0000 |
| commit | 475b19623f4e417f64da3db336b0d64492953785 (patch) | |
| tree | a66907777564be9dce38d783ac04d695936cd621 /api | |
| parent | 5d15da47ca3ebb67625f3f64c766ba78c51f1a5d (diff) | |
| parent | e7691dafecf60906d3d6660c532917466e5c25d1 (diff) | |
| download | frameworks_base-475b19623f4e417f64da3db336b0d64492953785.zip frameworks_base-475b19623f4e417f64da3db336b0d64492953785.tar.gz frameworks_base-475b19623f4e417f64da3db336b0d64492953785.tar.bz2 | |
am e7691daf: am 89f19371: am 6ab47fc1: Merge "Allow device initializers to set a preferred setup activity." into mnc-dev
* commit 'e7691dafecf60906d3d6660c532917466e5c25d1':
Allow device initializers to set a preferred setup activity.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 085b64d..b6b2b29 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5781,6 +5781,7 @@ package android.app.admin { method public void setPasswordQuality(android.content.ComponentName, int); method public boolean setPermittedAccessibilityServices(android.content.ComponentName, java.util.List<java.lang.String>); method public boolean setPermittedInputMethods(android.content.ComponentName, java.util.List<java.lang.String>); + method public void setPreferredSetupActivity(android.content.ComponentName, android.content.ComponentName); method public void setProfileEnabled(android.content.ComponentName); method public void setProfileName(android.content.ComponentName, java.lang.String); method public void setRecommendedGlobalProxy(android.content.ComponentName, android.net.ProxyInfo); diff --git a/api/system-current.txt b/api/system-current.txt index b9c1423..abe5b60 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5886,6 +5886,7 @@ package android.app.admin { method public void setPasswordQuality(android.content.ComponentName, int); method public boolean setPermittedAccessibilityServices(android.content.ComponentName, java.util.List<java.lang.String>); method public boolean setPermittedInputMethods(android.content.ComponentName, java.util.List<java.lang.String>); + method public void setPreferredSetupActivity(android.content.ComponentName, android.content.ComponentName); method public void setProfileEnabled(android.content.ComponentName); method public void setProfileName(android.content.ComponentName, java.lang.String); method public void setRecommendedGlobalProxy(android.content.ComponentName, android.net.ProxyInfo); |