Snap for 6179498 from 83e6bdd2bbb0554df69cade20ae90149fd52b9d9 to rvc-release (5b9cdc53) · Commits · e / os / android_packages_modules_Bluetooth

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);
		}