dis: Move code from android to profiles

This is a place holder until the code is ported to use shared API so it
can be shared by android and D-Bus daemon.

Makefile.am

@@ -403,7 +403,7 @@ unit_test_hog_SOURCES = unit/test-hog.c \
 			android/hog.h android/hog.c \
 			profiles/scanparam/scpp.h profiles/scanparam/scpp.c \
 			profiles/battery/bas.h profiles/battery/bas.c \
-			android/dis.h android/dis.c \
+			profiles/deviceinfo/dis.h profiles/deviceinfo/dis.c \
 			src/log.h src/log.c \
 			attrib/att.h attrib/att.c \
 			attrib/gatt.h attrib/gatt.c \

android/Android.mk

@@ -40,7 +40,7 @@ LOCAL_SRC_FILES := \
 	bluez/android/main.c \
 	bluez/android/bluetooth.c \
 	bluez/profiles/scanparam/scpp.c \
-	bluez/android/dis.c \
+	bluez/profiles/deviceinfo/dis.c \
 	bluez/profiles/battery/bas.c \
 	bluez/android/hog.c \
 	bluez/android/hidhost.c \

android/Makefile.am

@@ -30,7 +30,8 @@ android_bluetoothd_SOURCES = android/main.c \
 				android/hidhost.h android/hidhost.c \
 				profiles/scanparam/scpp.h \
 				profiles/scanparam/scpp.c \
-				android/dis.h android/dis.c \
+				profiles/deviceinfo/dis.h \
+				profiles/deviceinfo/dis.c \
 				profiles/battery/bas.h profiles/battery/bas.c \
 				android/hog.h android/hog.c \
 				android/ipc-common.h \

android/hog.c

@@ -54,7 +54,7 @@
 #include "btio/btio.h"
 
 #include "profiles/scanparam/scpp.h"
-#include "android/dis.h"
+#include "profiles/deviceinfo/dis.h"
 #include "profiles/battery/bas.h"
 #include "android/hog.h"
 

profiles/deviceinfo/dis.c

@@ -42,7 +42,7 @@
 #include "attrib/att.h"
 #include "attrib/gatt.h"
 
-#include "android/dis.h"
+#include "profiles/deviceinfo/dis.h"
 
 #define PNP_ID_SIZE	7