diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-09-18 18:19:59 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-10-28 10:14:50 -0400 |
| commit | fc5b4f757f5de3c82b19f6eb854acd3e08f88473 (patch) | |
| tree | 0d7d68e2dd6154dbd6c2dfbd2deba4fd03656291 /services | |
| parent | 14d21d9bd9b65ad29e863a20cfa71190fbab1119 (diff) | |
| download | frameworks_base-fc5b4f757f5de3c82b19f6eb854acd3e08f88473.zip frameworks_base-fc5b4f757f5de3c82b19f6eb854acd3e08f88473.tar.gz frameworks_base-fc5b4f757f5de3c82b19f6eb854acd3e08f88473.tar.bz2 | |
SystemServer: Don't start A2DP service if audio is not enabled
Change-Id: I95b8971cf79a99d8a98b48fd1337cc5cb4767e29
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 752a5ca..9d46c1c 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -233,10 +233,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); |