From 9997f66f6288f99e8cdab3201d3b6ad606789efe Mon Sep 17 00:00:00 2001
From: Jaikumar Ganesh <jaikumar@google.com>
Date: Tue, 4 May 2010 15:52:42 -0700
Subject: [PATCH] Revert "Fix runtime reboot when connecting to a A2DP headset
 and"

This reverts commit 55b0110fc298c403887b1311d7eabfffa230495f.
---
 core/java/android/server/BluetoothA2dpService.java | 1 -
 core/jni/android_bluetooth_common.cpp              | 1 -
 2 files changed, 2 deletions(-)

diff --git a/core/java/android/server/BluetoothA2dpService.java b/core/java/android/server/BluetoothA2dpService.java
index ac89934ada603..893db2e748c6f 100644
--- a/core/java/android/server/BluetoothA2dpService.java
+++ b/core/java/android/server/BluetoothA2dpService.java
@@ -554,7 +554,6 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub {
         if (!result) {
             if (deviceObjectPath != null) {
                 String address = mBluetoothService.getAddressFromObjectPath(deviceObjectPath);
-                if (address == null) return;
                 BluetoothDevice device = mAdapter.getRemoteDevice(address);
                 int state = getSinkState(device);
                 handleSinkStateChange(device, state, BluetoothA2dp.STATE_DISCONNECTED);
diff --git a/core/jni/android_bluetooth_common.cpp b/core/jni/android_bluetooth_common.cpp
index 9a8f1b8881f1c..343fa53904af0 100644
--- a/core/jni/android_bluetooth_common.cpp
+++ b/core/jni/android_bluetooth_common.cpp
@@ -65,7 +65,6 @@ static Properties adapter_properties[] = {
     {"PairableTimeout", DBUS_TYPE_UINT32},
     {"Discovering", DBUS_TYPE_BOOLEAN},
     {"Devices", DBUS_TYPE_ARRAY},
-    {"UUIDs", DBUS_TYPE_ARRAY},
 };
 
 typedef union {