commit 8f9c21780bc6fd7f9e583bd937af5036f1eafba0
author Jaikumar Ganesh <jaikumar@google.com> Fri Sep 09 09:01:37 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 09 09:01:37 2011 -0700
tree 8c9c8a0b9558f09e39c633ae4cbb9cfc0c24b985
parent 3bed2b1383aabf3b60312d9ccd471ffc4da8fc2b
parent d4d2ba8037b3262d01ba26a7fe007e86a38b1ab1

am d4d2ba80: Merge "Fix crash while connecting channel."

* commit 'd4d2ba8037b3262d01ba26a7fe007e86a38b1ab1':
  Fix crash while connecting channel.

core/java/android/server/BluetoothHealthProfileHandler.java

diff --git a/core/java/android/server/BluetoothHealthProfileHandler.java b/core/java/android/server/BluetoothHealthProfileHandler.java
index 8656cd9..a6ada2b 100644
--- a/core/java/android/server/BluetoothHealthProfileHandler.java
+++ b/core/java/android/server/BluetoothHealthProfileHandler.java
@@ -294,7 +294,7 @@
 
     private HealthChannel findChannelByPath(BluetoothDevice device, String path) {
         for (HealthChannel chan : mHealthChannels) {
-            if (chan.mChannelPath.equals(path) && chan.mDevice.equals(device)) return chan;
+            if (path.equals(chan.mChannelPath) && device.equals(chan.mDevice)) return chan;
         }
         return null;
     }