commit 98fc5e2570bb2c3bfe80532e57956ef59307a516
author Jaikumar Ganesh <jaikumar@google.com> Tue Mar 01 11:25:27 2011 -0800
committer Jake Hamby <jhamby@google.com> Tue Mar 01 19:12:44 2011 -0800
tree 9374684d09d66f88079f5be897a061be0eb9ff4f
parent 436b29e68e6608bed9e8e7d54385b8f62d89208e

Fix crashes with OPP profile in Settings app.

Change-Id: I712667f11c0de849da48add912421dfca3e85484

src/com/android/settings/bluetooth/OppProfile.java

diff --git a/src/com/android/settings/bluetooth/OppProfile.java b/src/com/android/settings/bluetooth/OppProfile.java
index 7cbae37..3f7df38 100644
--- a/src/com/android/settings/bluetooth/OppProfile.java
+++ b/src/com/android/settings/bluetooth/OppProfile.java
@@ -16,10 +16,11 @@
 
 package com.android.settings.bluetooth;
 
+import com.android.settings.R;
+
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
-
-import com.android.settings.R;
+import android.bluetooth.BluetoothProfile;
 
 /**
  * OppProfile handles Bluetooth OPP.
@@ -48,7 +49,7 @@
     }
 
     public int getConnectionStatus(BluetoothDevice device) {
-        return -1;  // FIXME: change to DISCONNECTED?
+        return BluetoothProfile.STATE_DISCONNECTED; // Settings app doesn't handle OPP
     }
 
     public boolean isPreferred(BluetoothDevice device) {
@@ -56,7 +57,7 @@
     }
 
     public int getPreferred(BluetoothDevice device) {
-        return -1;  // FIXME: is this correct?
+        return BluetoothProfile.PRIORITY_OFF; // Settings app doesn't handle OPP
     }
 
     public void setPreferred(BluetoothDevice device, boolean preferred) {