From 0db8bef9542ddc8589219cfe891490b40ad3efcc Mon Sep 17 00:00:00 2001 From: Ravi K Yenduri Date: Thu, 4 Jun 2009 15:46:53 -0500 Subject: [PATCH 1/2] Ignore pause and seek for live streaming. --- include/media/PVPlayer.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/media/PVPlayer.h b/include/media/PVPlayer.h index 8122df60eb5dd..de7a041854fda 100644 --- a/include/media/PVPlayer.h +++ b/include/media/PVPlayer.h @@ -62,6 +62,7 @@ private: static void run_set_video_surface(status_t s, void *cookie, bool cancelled); static void run_set_audio_output(status_t s, void *cookie, bool cancelled); static void run_prepare(status_t s, void *cookie, bool cancelled); + static void check_for_live_streaming(status_t s, void *cookie, bool cancelled); PlayerDriver* mPlayerDriver; char * mDataSourcePath; From 83bad3df01504e08d5a8520e46e01754bd5109b9 Mon Sep 17 00:00:00 2001 From: Alexey Tarasov Date: Wed, 12 Aug 2009 15:05:43 +1100 Subject: [PATCH 2/2] Fixed errors javadoc tags 1. @result -> @return in ActivityManagerService 2. @linke -> link in WiFiManager --- services/java/com/android/server/am/ActivityManagerService.java | 2 +- wifi/java/android/net/wifi/WifiManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 51ee41afb56e8..2e2cdb228cdd8 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -3997,7 +3997,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen * @param resultCode Result code, if any, from this Activity. * @param resultData Result data (Intent), if any, from this Activity. * - * @result Returns true if the activity successfully finished, or false if it is still running. + * @return Returns true if the activity successfully finished, or false if it is still running. */ public final boolean finishActivity(IBinder token, int resultCode, Intent resultData) { // Refuse possible leaked file descriptors diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 74f428451f546..e862a7a923f1d 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -959,7 +959,7 @@ public class WifiManager { * * If this MulticastLock is not reference-counted, the first call to * {@code release} (after the radio was multicast locked using - * {@linke #acquire}) will unlock the multicast, and subsequent calls + * {@link #acquire}) will unlock the multicast, and subsequent calls * will be ignored. * * Note that if any other Wifi Multicast Locks are still outstanding