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

Commit 6574eb58 authored by Etienne Ruffieux's avatar Etienne Ruffieux
Browse files

Moving bt stats logging to BatteryStats 

Tag: #feature
Bug: 211851706
Test: manual
Ignore-AOSP-First: Changes only in master
Change-Id: Ida785dd3a203a8669e8cdf39f9f8780057112bcb
parent 6ae5b0c7

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

+9 −5
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.ResolveInfo;

import android.content.res.Resources;

import android.database.ContentObserver;

import android.os.BatteryStatsManager;

import android.os.Binder;

import android.os.Bundle;

import android.os.Handler;
@@ -81,7 +82,6 @@ import android.util.proto.ProtoOutputStream; 


import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.FrameworkStatsLog;

import com.android.modules.utils.SynchronousResultReceiver;



import java.io.FileDescriptor;
@@ -200,6 +200,7 @@ 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;
@@ -510,6 +511,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
        mCallbacks = new RemoteCallbackList<IBluetoothManagerCallback>();

        mStateChangeCallbacks = new RemoteCallbackList<IBluetoothStateChangeCallback>();



        mBatteryStatsManager = context.getSystemService(BatteryStatsManager.class);



        mUserManager = mContext.getSystemService(UserManager.class);



        mIsHearingAidProfileSupported =
@@ -2774,10 +2777,11 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                    new ActiveLog(reason, packageName, enable, System.currentTimeMillis()));

        }



        int state = enable ? FrameworkStatsLog.BLUETOOTH_ENABLED_STATE_CHANGED__STATE__ENABLED :

                             FrameworkStatsLog.BLUETOOTH_ENABLED_STATE_CHANGED__STATE__DISABLED;

        FrameworkStatsLog.write_non_chained(1,

                Binder.getCallingUid(), null, state, reason, packageName);

        if (enable) {

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

        } else {

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

        }

    }



    private void addCrashLog() {