diff options
| -rw-r--r-- | docs/html/guide/topics/security/security.jd | 17 | ||||
| -rw-r--r-- | media/java/android/media/MediaPlayer.java | 8 |
2 files changed, 14 insertions, 11 deletions
diff --git a/docs/html/guide/topics/security/security.jd b/docs/html/guide/topics/security/security.jd index da201c4..dbc9866 100644 --- a/docs/html/guide/topics/security/security.jd +++ b/docs/html/guide/topics/security/security.jd @@ -40,15 +40,14 @@ includes reading or writing the user's private data (such as contacts or e-mails), reading or writing another application's files, performing network access, keeping the device awake, etc.<p> -<p>An application's process is a secure sandbox. It can't disrupt other -applications, except by explicitly declaring the <em>permissions</em> it needs -for additional capabilities not provided by the basic sandbox. These -permissions it requests can be handled by the operating in various ways, -typically by automatically allowing or disallowing based on certificates or -by prompting the user. The permissions required by an application are declared -statically in that application, so they can be known up-front at install time -and will not change after that.</p> - +<p>An application's process runs in a security sandbox. The sandbox is designed +to prevent applications from disrupting each other, except by explicitly +declaring the <em>permissions</em> they need for additional capabilities not +provided by the basic sandbox. The system handles requests for permissions +in various ways, typically by automatically allowing or disallowing based on +certificates or by prompting the user. The permissions required by an +application are declared statically in that application, so they can be known +up-front at install time and will not change after that.</p> <a name="signing"></a> <h2>Application Signing</h2> diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index e8b89e0..38b1582 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -344,7 +344,9 @@ import java.lang.ref.WeakReference; * <td>{Idle, Initialized, Stopped, Prepared, Started, Paused, * PlaybackCompleted}</p></td> * <td>{Error}</p></td> - * <td>Successful invoke of this method does not change the state.</p></td></tr> + * <td>Successful invoke of this method does not change the state. In order for the + * target audio stream type to become effective, this method must be called before + * prepare() or prepareAsync().</p></td></tr> * <tr><td>setDataSource </p></td> * <td>{Idle} </p></td> * <td>{Initialized, Prepared, Started, Paused, Stopped, PlaybackCompleted, @@ -1112,7 +1114,9 @@ public class MediaPlayer /** * Sets the audio stream type for this MediaPlayer. See {@link AudioManager} - * for a list of stream types. + * for a list of stream types. Must call this method before prepare() or + * prepareAsync() in order for the target stream type to become effective + * thereafter. * * @param streamtype the audio stream type * @see android.media.AudioManager |