summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2010-11-04 13:47:13 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-04 13:47:13 -0700
commit1ab022b8c8b063d95a591bf40109986c5b1bbb11 (patch)
treed5524a2111de5e7273064f6cdd4d4f6e61eff5b7
parent218c60edc9976d701cfdc47925643e29712fc1cf (diff)
parentb55dcc244dbf22704c79b5439a9d3fc9f9815308 (diff)
downloadframeworks_base-1ab022b8c8b063d95a591bf40109986c5b1bbb11.zip
frameworks_base-1ab022b8c8b063d95a591bf40109986c5b1bbb11.tar.gz
frameworks_base-1ab022b8c8b063d95a591bf40109986c5b1bbb11.tar.bz2
Merge "Fix an off-by-one error."
-rw-r--r--services/java/com/android/server/WiredAccessoryObserver.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/WiredAccessoryObserver.java b/services/java/com/android/server/WiredAccessoryObserver.java
index 2046473..d97d41c 100644
--- a/services/java/com/android/server/WiredAccessoryObserver.java
+++ b/services/java/com/android/server/WiredAccessoryObserver.java
@@ -75,7 +75,7 @@ class WiredAccessoryObserver extends UEventObserver {
// At any given time both headsets could be inserted
// one on the board and one on the dock
// observe two UEVENTs
- for (int i = 0; i <= MAX_AUDIO_PORTS; i++) {
+ for (int i = 0; i < MAX_AUDIO_PORTS; i++) {
startObserving(uEventInfo[i][0]);
}
init(); // set initial status
@@ -120,7 +120,7 @@ class WiredAccessoryObserver extends UEventObserver {
int newState = mHeadsetState;
mPrevHeadsetState = mHeadsetState;
- for (int i = 0; i <= MAX_AUDIO_PORTS; i++) {
+ for (int i = 0; i < MAX_AUDIO_PORTS; i++) {
try {
FileReader file = new FileReader(uEventInfo[i][1]);
int len = file.read(buffer, 0, 1024);