commit d4d2ba8037b3262d01ba26a7fe007e86a38b1ab1
author Jaikumar Ganesh <jaikumar@google.com> Thu Sep 08 15:20:19 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 08 15:20:19 2011 -0700
tree af2a2cf52b724fc58387f2b262f5484a1a7a5db2
parent cedd460820ffc3e88fdac5926baf588279c38b6f
parent 8ee53da5615ff69c7920d111f87730c9ae0a5d23

Merge "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;
     }