summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2011-02-23 09:58:33 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-23 09:58:33 -0800
commit87e639bc151551c9618641a6765837b44eb90b9b (patch)
tree500a02d889ecbe86dd305df226d7282153e4c740 /media/java
parent282ff9ae3f798dec325ce6b868f053649b596a8c (diff)
parentd211f41f764fe81fe00b10a99b4b44cb84479cbe (diff)
downloadframeworks_base-87e639bc151551c9618641a6765837b44eb90b9b.zip
frameworks_base-87e639bc151551c9618641a6765837b44eb90b9b.tar.gz
frameworks_base-87e639bc151551c9618641a6765837b44eb90b9b.tar.bz2
Merge "- Add method in MediaPlayerService to collect and pull codec usage (duration) for the battery app - Collect MediaPlayer decoding usage data"
Diffstat (limited to 'media/java')
-rw-r--r--media/java/android/media/MediaPlayer.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index 98ddbe7..9c92ace 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -1235,6 +1235,14 @@ public class MediaPlayer
private native final void native_setup(Object mediaplayer_this);
private native final void native_finalize();
+ /**
+ * @param reply Parcel with audio/video duration info for battery
+ tracking usage
+ * @return The status code.
+ * {@hide}
+ */
+ public native static int native_pullBatteryData(Parcel reply);
+
@Override
protected void finalize() { native_finalize(); }