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

Commit 1467ff84 authored by Yueming Wang's avatar Yueming Wang Committed by android-build-merger
Browse files

Merge "Revert "Log: Bluetooth Connections"" 

am: 8ec03d0c

Change-Id: I29a098167b8a2474352a5fb10597778408367c06
parents c331b322 8ec03d0c

android/app/src/com/android/bluetooth/btservice/AdapterProperties.java

+0 −7
Original line number Diff line number Diff line
@@ -40,10 +40,8 @@ import android.content.IntentFilter; 
import android.os.ParcelUuid;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.provider.Settings.Secure;

import android.util.Log;

import android.util.Pair;

import android.util.StatsLog;



import com.android.bluetooth.Utils;

import com.android.bluetooth.btservice.RemoteDevices.DeviceProperties;
@@ -526,11 +524,6 @@ class AdapterProperties { 
        Log.d(TAG,

                "PROFILE_CONNECTION_STATE_CHANGE: profile=" + profile + ", device=" + device + ", "

                        + prevState + " -> " + state);

        String ssaid = Secure.getString(mService.getContentResolver(), Secure.ANDROID_ID);

        String combined = ssaid + device.getAddress();

        int obfuscated_id = combined.hashCode() & 0xFFFF; // Last two bytes only

        StatsLog.write(StatsLog.BLUETOOTH_CONNECTION_STATE_CHANGED,

                state, obfuscated_id, profile);

        if (!isNormalStateTransition(prevState, state)) {

            Log.w(TAG,

                    "PROFILE_CONNECTION_STATE_CHANGE: unexpected transition for profile=" + profile