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

Commit a5ff0917 authored by Muhammad Qureshi's avatar Muhammad Qureshi
Browse files

Use FrameworkStatsLog instead of StatsLog 

As part of statsd becoming a Mainline module in R, autogenerated
StatsLog.write() calls are going away and replaced by
*StatsLog.java
that is autogenerated for each module.
This CL replaces some usages of StatsLog with
FrameworkStatsLog.

Bug: 145952197
Test: m
Change-Id: Iaa2db34a7be4c3215f62cc36661ba8ac81656baa
parent 884fee5e

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

+5 −6
Original line number Diff line number Diff line
@@ -69,17 +69,17 @@ import android.text.TextUtils; 
import android.util.FeatureFlagUtils;

import android.util.Log;

import android.util.Slog;

import android.util.StatsLog;



import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.FrameworkStatsLog;

import com.android.server.pm.UserRestrictionsUtils;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.HashMap;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.LinkedList;

import java.util.Locale;

import java.util.Map;
@@ -87,7 +87,6 @@ import java.util.NoSuchElementException; 
import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.locks.ReentrantReadWriteLock;





class BluetoothManagerService extends IBluetoothManager.Stub {

    private static final String TAG = "BluetoothManagerService";

    private static final boolean DBG = true;
@@ -2300,9 +2299,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                    new ActiveLog(reason, packageName, enable, System.currentTimeMillis()));

        }



        int state = enable ? StatsLog.BLUETOOTH_ENABLED_STATE_CHANGED__STATE__ENABLED :

                             StatsLog.BLUETOOTH_ENABLED_STATE_CHANGED__STATE__DISABLED;

        StatsLog.write_non_chained(StatsLog.BLUETOOTH_ENABLED_STATE_CHANGED,

        int state = enable ? FrameworkStatsLog.BLUETOOTH_ENABLED_STATE_CHANGED__STATE__ENABLED :

                             FrameworkStatsLog.BLUETOOTH_ENABLED_STATE_CHANGED__STATE__DISABLED;

        FrameworkStatsLog.write_non_chained(FrameworkStatsLog.BLUETOOTH_ENABLED_STATE_CHANGED,

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

    }