Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11fdeb14 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Remove BatteryStatService call" am: 1e356f0e 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2579516



Change-Id: I1eae7351679916ee2bf107abb02ad98db119c121
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e79e7f9d 1e356f0e

service/src/com/android/server/bluetooth/BluetoothManagerService.java

+0 −10
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ import android.content.pm.PackageInfo; 
import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.database.ContentObserver;

import android.os.BatteryStatsManager;

import android.os.Binder;

import android.os.Bundle;

import android.os.Handler;
@@ -213,7 +212,6 @@ public class BluetoothManagerService extends IBluetoothManager.Stub { 
    private String mAddress;

    private String mName;

    private final ContentResolver mContentResolver;

    private final BatteryStatsManager mBatteryStatsManager;

    private final RemoteCallbackList<IBluetoothManagerCallback> mCallbacks;

    private final RemoteCallbackList<IBluetoothStateChangeCallback> mStateChangeCallbacks;

    private IBinder mBluetoothBinder;
@@ -643,8 +641,6 @@ public class BluetoothManagerService extends IBluetoothManager.Stub { 
        mCallbacks = new RemoteCallbackList<IBluetoothManagerCallback>();

        mStateChangeCallbacks = new RemoteCallbackList<IBluetoothStateChangeCallback>();



        mBatteryStatsManager = context.getSystemService(BatteryStatsManager.class);



        mUserManager = mContext.getSystemService(UserManager.class);



        mBluetoothNotificationManager = new BluetoothNotificationManager(mContext);
@@ -3099,12 +3095,6 @@ public class BluetoothManagerService extends IBluetoothManager.Stub { 
            mActiveLogs.add(

                    new ActiveLog(reason, packageName, enable, System.currentTimeMillis()));

        }



        if (enable) {

            mBatteryStatsManager.reportBluetoothOn(Binder.getCallingUid(), reason, packageName);

        } else {

            mBatteryStatsManager.reportBluetoothOff(Binder.getCallingUid(), reason, packageName);

        }

    }



    private void addCrashLog() {