From 14fb81af281468735bed1da99931ecc5a0539344 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Thu, 5 Nov 2009 11:41:58 -0800
Subject: [PATCH] Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn

This should remove the deadlock. I'm not absolutely positive that
it fixes it, as it's not easy to reproduce.
---
 services/java/com/android/server/am/BatteryStatsService.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/java/com/android/server/am/BatteryStatsService.java b/services/java/com/android/server/am/BatteryStatsService.java
index 5a1619a23fd57..d59aeada22d82 100644
--- a/services/java/com/android/server/am/BatteryStatsService.java
+++ b/services/java/com/android/server/am/BatteryStatsService.java
@@ -16,6 +16,7 @@
 
 package com.android.server.am;
 
+import android.bluetooth.BluetoothHeadset;
 import android.content.Context;
 import android.os.Binder;
 import android.os.IBinder;
@@ -23,7 +24,6 @@ import android.os.Parcel;
 import android.os.Process;
 import android.os.ServiceManager;
 import android.telephony.SignalStrength;
-import android.telephony.TelephonyManager;
 import android.util.Log;
 
 import com.android.internal.app.IBatteryStats;
@@ -263,9 +263,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub {
 
     public void noteBluetoothOn() {
         enforceCallingPermission();
+        BluetoothHeadset headset = new BluetoothHeadset(mContext, null);
         synchronized (mStats) {
             mStats.noteBluetoothOnLocked();
-            mStats.setBtHeadset(new android.bluetooth.BluetoothHeadset(mContext, null));
+            mStats.setBtHeadset(headset);
         }
     }