Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs

Browse Source 
* commit '1b8e319784a1bb166aaa6b0f1dc306f8d4b6e57f':
  Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994
This commit is contained in:
David Friedman
2013-09-27 10:37:07 -07:00
committed by Android Git Automerger
parent 657343d782 1b8e319784
commit 233a341b6d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/html/training/articles/security-ssl.jd
View File

@@ -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

2
media/java/android/media/SoundPool.java
View File

@@ -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);