commit 0f42037eb7b5118015c2caca635538324ccf0ccf
author fredc <fredc@broadcom.com> Thu Apr 12 00:02:00 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 16 21:20:54 2012 -0700
tree 46a7ba36216a2cb617541ec68f18b413419e148f
parent 919a4c6264b733585152ce1dc6f868c1093d368b

Non persistent adapter service

Change-Id: Ib13d5c77416e58161df0e04d7a15ec0dddbde8b5

Conflicts:

	core/java/android/bluetooth/BluetoothInputDevice.java

Conflicts:

	core/java/com/android/internal/app/ShutdownThread.java
	services/java/com/android/server/SystemServer.java

Conflicts:

	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/pm/ShutdownThread.java

Android.mk

diff --git a/Android.mk b/Android.mk
index 8481e72..5fb66ab 100644
--- a/Android.mk
+++ b/Android.mk
@@ -93,6 +93,9 @@
 	core/java/android/bluetooth/IBluetoothHealth.aidl \
 	core/java/android/bluetooth/IBluetoothHealthCallback.aidl \
 	core/java/android/bluetooth/IBluetoothInputDevice.aidl \
+	core/java/android/bluetooth/IBluetoothPan.aidl \
+	core/java/android/bluetooth/IBluetoothManager.aidl \
+	core/java/android/bluetooth/IBluetoothManagerCallback.aidl \
 	core/java/android/bluetooth/IBluetoothPbap.aidl \
 	core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \
 	core/java/android/content/IClipboard.aidl \