Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c38ea39 authored by David Friedman's avatar David Friedman Committed by Android (Google) Code Review
Browse files

Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security... 

Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs
parents 23bd5927 36b692d8

docs/html/training/articles/security-ssl.jd

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

This is similar to an unknown certificate authority, so you can use the

same approach from the previous section.</p>

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

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

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

securely. However, you should be careful to make sure your self-signed certificate has a

media/java/android/media/SoundPool.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -410,7 +410,7 @@ public class SoundPool 
         * Called when a sound has completed loading.

         * Called when a sound has completed loading.

         *

         *

         * @param soundPool SoundPool object from the load() method

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

         * @param status the status of the load operation (0 = success)

         */

         */

        public void onLoadComplete(SoundPool soundPool, int sampleId, int status);

        public void onLoadComplete(SoundPool soundPool, int sampleId, int status);