diff options
| author | Robin Lee <rgl@google.com> | 2015-05-05 15:57:17 +0100 |
|---|---|---|
| committer | Robin Lee <rgl@google.com> | 2015-05-14 07:15:18 +0100 |
| commit | 39087b1cec6a54e96ab9eafe8317952720790533 (patch) | |
| tree | 2cf6abb18a200d9d55423ab3280f91e4396e2f8c /api/system-current.txt | |
| parent | a47fb5ad5d3863bc6de418c7269d2463f39f432b (diff) | |
| download | frameworks_base-39087b1cec6a54e96ab9eafe8317952720790533.zip frameworks_base-39087b1cec6a54e96ab9eafe8317952720790533.tar.gz frameworks_base-39087b1cec6a54e96ab9eafe8317952720790533.tar.bz2 | |
Replace String host:port/url args with Uri arg
Uri provides a stronger guarantee of well-formedness and lets apps do
nice extra things like specifying scheme etc. without twisting any
expectations.
Bug: 20820034
Change-Id: Ia6bbedb74765444920b667d643fb7e1eb6a7292b
Diffstat (limited to 'api/system-current.txt')
| -rw-r--r-- | api/system-current.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 5d11b25..6cbd7d0 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5731,7 +5731,7 @@ package android.app.admin { ctor public DeviceAdminReceiver(); method public android.app.admin.DevicePolicyManager getManager(android.content.Context); method public android.content.ComponentName getWho(android.content.Context); - method public java.lang.String onChoosePrivateKeyAlias(android.content.Context, android.content.Intent, int, java.lang.String, int, java.lang.String, java.lang.String); + method public java.lang.String onChoosePrivateKeyAlias(android.content.Context, android.content.Intent, int, android.net.Uri, java.lang.String); method public java.lang.CharSequence onDisableRequested(android.content.Context, android.content.Intent); method public void onDisabled(android.content.Context, android.content.Intent); method public void onEnabled(android.content.Context, android.content.Intent); @@ -30365,7 +30365,7 @@ package android.security { public final class KeyChain { ctor public KeyChain(); method public static void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], java.lang.String, int, java.lang.String); - method public static void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], java.lang.String, int, java.lang.String, java.lang.String); + method public static void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], android.net.Uri, java.lang.String); method public static android.content.Intent createInstallIntent(); method public static java.security.cert.X509Certificate[] getCertificateChain(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException; method public static java.security.PrivateKey getPrivateKey(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException; |