Make android specific changes to conf files.

Change-Id: I60bfb7cf24f1152913f944652e413509a6c31f26
diff --git a/audio/audio.conf b/audio/audio.conf
index 302e046..e44e768 100644
--- a/audio/audio.conf
+++ b/audio/audio.conf
@@ -3,6 +3,8 @@
 # This section contains options which are not specific to any
 # particular interface
 [General]
+Enable=Source,Control,Sink
+Disable=Headset,Gateway
 
 # Switch to master role for incoming connections (defaults to true)
 #Master=true
@@ -23,14 +25,14 @@
 
 # Headset interface specific options (i.e. options which affect how the audio
 # service interacts with remote headset devices)
-[Headset]
+#[Headset]
 
-# Set to true to support HFP, false means only HSP is supported
-# Defaults to true
-HFP=true
+# Set to true to support HFP (in addition to HSP only which is the default)
+# Defaults to false
+#HFP=true
 
 # Maximum number of connected HSP/HFP devices per adapter. Defaults to 1
-MaxConnected=1
+#MaxConnections=1
 
 # Set to true to enable use of fast connectable mode (faster page scanning)
 # for HFP when incomming call starts. Default settings are restored after
@@ -40,6 +42,9 @@
 FastConnectable=false
 
 # Just an example of potential config options for the other interfaces
-#[A2DP]
-#SBCSources=1
-#MPEG12Sources=0
+[A2DP]
+SBCSources=1
+MPEG12Sources=0
+
+[AVRCP]
+InputDeviceName=AVRCP
diff --git a/src/main.conf b/src/main.conf
index 8cd132f..0418e7c 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -6,7 +6,7 @@
 # Default adaper name
 # %h - substituted for hostname
 # %d - substituted for adapter id
-Name = %h-%d
+Name = "Bluez"
 
 # Default device class. Only the major and minor device class bits are
 # considered.
@@ -15,7 +15,7 @@
 # How long to stay in discoverable mode before going back to non-discoverable
 # The value is in seconds. Default is 180, i.e. 3 minutes.
 # 0 = disable timer, i.e. stay discoverable forever
-DiscoverableTimeout = 0
+DiscoverableTimeout = 120
 
 # How long to stay in pairable mode before going back to non-discoverable
 # The value is in seconds. Default is 0.
@@ -39,7 +39,7 @@
 
 # Use vendor, product and version information for DID profile support.
 # The values are separated by ":" and VID, PID and version.
-#DeviceID = 1234:5678:abcd
+DeviceID = android:generic:1.5
 
 # Do reverse service discovery for previously unknown devices that connect to
 # us. This option is really only needed for qualification since the BITE tester