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

am 4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1

Browse Source 
* commit '4fdc36e6d6003cdce911678f0b233697554f8dbf':
  Document that release() should be called with onPause() and onStop() for media objects
This commit is contained in:
James Dong
2011-11-15 20:16:47 -08:00
committed by Android Git Automerger
parent 868933e0e4 4fdc36e6d6
commit 4e72e2bfc2
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
media/java/android/media/MediaPlayer.java
View File

@@ -1149,14 +1149,20 @@ public class MediaPlayer
/** /**
* Releases resources associated with this MediaPlayer object. * Releases resources associated with this MediaPlayer object.
* It is considered good practice to call this method when you're * It is considered good practice to call this method when you're
* done using the MediaPlayer. For instance, whenever the Activity * done using the MediaPlayer. In particular, whenever an Activity
* of an application is paused, this method should be invoked to * of an application is paused (its onPause() method is called),
* release the MediaPlayer object. In addition to unnecessary resources * or stopped (its onStop() method is called), this method should be
* (such as memory and instances of codecs) being hold, failure to * invoked to release the MediaPlayer object, unless the application
* call this method immediately if a MediaPlayer object is no longer * has a special need to keep the object around. In addition to
* needed may also lead to continuous battery consumption for mobile * unnecessary resources (such as memory and instances of codecs)
* devices, and playback failure if no multiple instances of the * being held, failure to call this method immediately if a
* same codec is supported on a device. * MediaPlayer object is no longer needed may also lead to
* continuous battery consumption for mobile devices, and playback
* failure for other applications if no multiple instances of the
* same codec are supported on a device. Even if multiple instances
* of the same codec are supported, some performance degradation
* may be expected when unnecessary multiple instances are used
* at the same time.
*/ */
public void release() { public void release() {
stayAwake(false); stayAwake(false);

15
media/java/android/media/MediaRecorder.java
View File

@@ -926,7 +926,20 @@ public class MediaRecorder
/** /**
* Releases resources associated with this MediaRecorder object. * Releases resources associated with this MediaRecorder object.
* It is good practice to call this method when you're done * It is good practice to call this method when you're done
* using the MediaRecorder. * using the MediaRecorder. In particular, whenever an Activity
* of an application is paused (its onPause() method is called),
* or stopped (its onStop() method is called), this method should be
* invoked to release the MediaRecorder object, unless the application
* has a special need to keep the object around. In addition to
* unnecessary resources (such as memory and instances of codecs)
* being held, failure to call this method immediately if a
* MediaRecorder object is no longer needed may also lead to
* continuous battery consumption for mobile devices, and recording
* failure for other applications if no multiple instances of the
* same codec are supported on a device. Even if multiple instances
* of the same codec are supported, some performance degradation
* may be expected when unnecessary multiple instances are used
* at the same time.
*/ */
public native void release(); public native void release();