diff options
| -rw-r--r-- | docs/html/training/articles/security-ssl.jd | 2 | ||||
| -rw-r--r-- | media/java/android/media/SoundPool.java | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/media/java/android/media/SoundPool.java b/media/java/android/media/SoundPool.java index 587af47..acbf03a 100644 --- a/media/java/android/media/SoundPool.java +++ b/media/java/android/media/SoundPool.java @@ -410,7 +410,7 @@ public class SoundPool * Called when a sound has completed loading. * * @param soundPool SoundPool object from the load() method - * @param soundPool the sample ID of the sound loaded. + * @param sampleId the sample ID of the sound loaded. * @param status the status of the load operation (0 = success) */ public void onLoadComplete(SoundPool soundPool, int sampleId, int status); |