diff options
| author | David Friedman <dmail@google.com> | 2013-09-27 17:24:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-27 17:24:41 +0000 |
| commit | 8c38ea39203016dde95bc5dd68f27f6f45096784 (patch) | |
| tree | 0b31586fa253bd3adf3ce8afa9665ff21eee5849 /docs/html/training | |
| parent | 23bd5927f1c82f3f63288fbee4e7c460fca3dc4e (diff) | |
| parent | 36b692d8ef595eee1e28d20b740be548365a5671 (diff) | |
| download | frameworks_base-8c38ea39203016dde95bc5dd68f27f6f45096784.zip frameworks_base-8c38ea39203016dde95bc5dd68f27f6f45096784.tar.gz frameworks_base-8c38ea39203016dde95bc5dd68f27f6f45096784.tar.bz2 | |
Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs
Diffstat (limited to 'docs/html/training')
| -rw-r--r-- | docs/html/training/articles/security-ssl.jd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/training/articles/security-ssl.jd b/docs/html/training/articles/security-ssl.jd index d3f68e2..f52865a 100644 --- a/docs/html/training/articles/security-ssl.jd +++ b/docs/html/training/articles/security-ssl.jd @@ -250,7 +250,7 @@ due to a self-signed certificate, which means the server is behaving as its own This is similar to an unknown certificate authority, so you can use the same approach from the previous section.</p> -<p>You can create yout own {@link javax.net.ssl.TrustManager}, +<p>You can create your own {@link javax.net.ssl.TrustManager}, this time trusting the server certificate directly. This has all of the downsides discussed earlier of tying your app directly to a certificate, but can be done securely. However, you should be careful to make sure your self-signed certificate has a |