From 1df6a0230adf2fe3cb8fbe6c6ce52ba460dbbe3b Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Sun, 18 Sep 2011 18:19:59 -0400
Subject: [PATCH] SystemServer: Don't start A2DP service if audio is not
 enabled

Change-Id: I1f0ccf5ecb878a66a7c24d046ad1fb076a5f8e44
Signed-off-by: Mike Lockwood <lockwood@android.com>
---
 services/java/com/android/server/SystemServer.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index f69a35b5e2862..dd88dd371ea57 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -214,10 +214,13 @@ class ServerThread extends Thread {
                 bluetooth = new BluetoothService(context);
                 ServiceManager.addService(BluetoothAdapter.BLUETOOTH_SERVICE, bluetooth);
                 bluetooth.initAfterRegistration();
-                bluetoothA2dp = new BluetoothA2dpService(context, bluetooth);
-                ServiceManager.addService(BluetoothA2dpService.BLUETOOTH_A2DP_SERVICE,
-                                          bluetoothA2dp);
-                bluetooth.initAfterA2dpRegistration();
+
+                if (!"0".equals(SystemProperties.get("system_init.startaudioservice"))) {
+                    bluetoothA2dp = new BluetoothA2dpService(context, bluetooth);
+                    ServiceManager.addService(BluetoothA2dpService.BLUETOOTH_A2DP_SERVICE,
+                                              bluetoothA2dp);
+                    bluetooth.initAfterA2dpRegistration();
+                }
 
                 int airplaneModeOn = Settings.System.getInt(mContentResolver,
                         Settings.System.AIRPLANE_MODE_ON, 0);