diff options
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/BatteryService.java | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/am/BatteryStatsService.java | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 0ea880b35a7a..99242ab9ff92 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -574,6 +574,8 @@ void AwesomePlayer::reset_l() { mStats.mTracks.clear(); } + mWatchForAudioSeekComplete = false; + mWatchForAudioEOS = false; } void AwesomePlayer::notifyListener_l(int msg, int ext1, int ext2) { diff --git a/services/java/com/android/server/BatteryService.java b/services/java/com/android/server/BatteryService.java index 1aff9a2b80d0..ab9ae69b9945 100644 --- a/services/java/com/android/server/BatteryService.java +++ b/services/java/com/android/server/BatteryService.java @@ -498,7 +498,7 @@ class BatteryService extends Binder { return; } - if (args == null || args.length == 0) { + if (args == null || args.length == 0 || "-a".equals(args[0])) { synchronized (this) { pw.println("Current Battery Service state:"); pw.println(" AC powered: " + mAcOnline); diff --git a/services/java/com/android/server/am/BatteryStatsService.java b/services/java/com/android/server/am/BatteryStatsService.java index 293702dfe750..226723fbed6c 100644 --- a/services/java/com/android/server/am/BatteryStatsService.java +++ b/services/java/com/android/server/am/BatteryStatsService.java @@ -478,6 +478,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub { } else if ("-h".equals(arg)) { dumpHelp(pw); return; + } else if ("-a".equals(arg)) { + // fall through } else { pw.println("Unknown option: " + arg); dumpHelp(pw); |