Merge change 4674 into donut

* changes:
  FIX 1914930 -- 	Bad state of Emergency Dialer after orientation change.

diff --git a/src/com/android/phone/BluetoothHeadsetService.java b/src/com/android/phone/BluetoothHeadsetService.java
index fec992c580dce301528f6b977c425084d43d1a98..ab298e08583f3a8c00b0dd9ab48e03784b1ffa7a 100644 (file)
--- a/src/com/android/phone/BluetoothHeadsetService.java
+++ b/src/com/android/phone/BluetoothHeadsetService.java
@@ -650,6 +650,11 @@ public class BluetoothHeadsetService extends Service {
             }
             return mHeadsetPriority.get(address.toUpperCase());
         }
+        public int getBatteryUsageHint() {
+            enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
+
+            return HeadsetBase.getAtInputCount();
+        }
     };
 
     @Override