commit 06ad3f19f5352efafced33058356a29caa7c5403
author Adam Powell <adamp@google.com> Tue Aug 16 13:10:55 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 16 13:10:55 2011 -0700
tree 5d26eac20bec9de741638eb9d3638caa14d26b22
parent 92bebc3259c802be2a2313fadbe0116381189d7d
parent e43fca99573291311f90b540d67833011d5fc6be

Merge "Offer a masked version of setUiOptions for windows to only modify certain flags."

media/libstagefright/AwesomePlayer.cpp

diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 0ea880b..99242ab 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -574,6 +574,8 @@
         mStats.mTracks.clear();
     }
 
+    mWatchForAudioSeekComplete = false;
+    mWatchForAudioEOS = false;
 }
 
 void AwesomePlayer::notifyListener_l(int msg, int ext1, int ext2) {

services/java/com/android/server/BatteryService.java

diff --git a/services/java/com/android/server/BatteryService.java b/services/java/com/android/server/BatteryService.java
index 1aff9a2..ab9ae69 100644
--- a/services/java/com/android/server/BatteryService.java
+++ b/services/java/com/android/server/BatteryService.java
@@ -498,7 +498,7 @@
             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);

services/java/com/android/server/am/BatteryStatsService.java

diff --git a/services/java/com/android/server/am/BatteryStatsService.java b/services/java/com/android/server/am/BatteryStatsService.java
index 293702d..226723f 100644
--- a/services/java/com/android/server/am/BatteryStatsService.java
+++ b/services/java/com/android/server/am/BatteryStatsService.java
@@ -478,6 +478,8 @@
                 } else if ("-h".equals(arg)) {
                     dumpHelp(pw);
                     return;
+                } else if ("-a".equals(arg)) {
+                    // fall through
                 } else {
                     pw.println("Unknown option: " + arg);
                     dumpHelp(pw);