From: Adam Lesinski <adamlesinski@google.com>
Date: Thu, 28 Jan 2016 20:14:37 +0000 (-0800)
Subject: Reset ble scans in BatteryStats on start up
X-Git-Tag: android-7.1.2_r17~194^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=214b72b021e94649f5015ab3e5ae64a4e2012c1b;p=android-x86%2Fpackages-apps-Bluetooth.git

Reset ble scans in BatteryStats on start up

Bug:22718669
Change-Id: I89b0106776aadfd383a11c509f6eba660461bd31
---

diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java
index 9f8c86ea..bd4fdb9b 100644
--- a/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/src/com/android/bluetooth/btservice/AdapterService.java
@@ -41,6 +41,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
+import android.os.BatteryStats;
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.Handler;
@@ -86,6 +87,7 @@ import java.util.List;
 
 import android.content.pm.PackageManager;
 import android.os.ServiceManager;
+import com.android.internal.app.IBatteryStats;
 
 public class AdapterService extends Service {
     private static final String TAG = "BluetoothAdapterService";
@@ -199,6 +201,7 @@ public class AdapterService extends Service {
 
     private AlarmManager mAlarmManager;
     private PendingIntent mPendingAlarm;
+    private IBatteryStats mBatteryStats;
     private PowerManager mPowerManager;
     private PowerManager.WakeLock mWakeLock;
     private String mWakeLockName;
@@ -428,6 +431,8 @@ public class AdapterService extends Service {
         getAdapterPropertyNative(AbstractionLayer.BT_PROPERTY_BDNAME);
         mAlarmManager = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
         mPowerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
+        mBatteryStats = IBatteryStats.Stub.asInterface(ServiceManager.getService(
+                BatteryStats.SERVICE_NAME));
 
         mSdpManager = SdpManager.init(this);
         registerReceiver(mAlarmBroadcastReceiver, new IntentFilter(ACTION_ALARM_WAKEUP));
@@ -482,6 +487,12 @@ public class AdapterService extends Service {
 
         mJniCallbacks.init(mBondStateMachine,mRemoteDevices);
 
+        try {
+            mBatteryStats.noteResetBleScan();
+        } catch (RemoteException e) {
+            // Ignore.
+        }
+
         //FIXME: Set static instance here???
         setAdapterService(this);