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

Commit e4302178 authored Dec 12, 2019 by Chen Chen Committed by android-build-merger Dec 12, 2019

Merge "Updateability: Resolve dependency to android/internal/util/StateMachine"

am: 47f22841

Change-Id: I448bf1fd27344133ae0da9aa1ef007acb135509c

parents 7da689ad 47f22841

android/app/src/com/android/bluetooth/a2dp/A2dpStateMachine.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -57,9 +57,9 @@ import android.util.Log;
		import android.util.StatsLog;

		import com.android.bluetooth.btservice.ProfileService;
		import com.android.bluetooth.statemachine.State;
		import com.android.bluetooth.statemachine.StateMachine;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.State;
		import com.android.internal.util.StateMachine;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;

android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachine.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -28,8 +28,8 @@ import com.android.bluetooth.BluetoothMetricsProto;
		import com.android.bluetooth.Utils;
		import com.android.bluetooth.btservice.MetricsLogger;
		import com.android.bluetooth.btservice.ProfileService;
		import com.android.internal.util.State;
		import com.android.internal.util.StateMachine;
		import com.android.bluetooth.statemachine.State;
		import com.android.bluetooth.statemachine.StateMachine;


		public class A2dpSinkStateMachine extends StateMachine {

android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachine.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -37,8 +37,8 @@ import com.android.bluetooth.Utils;
		import com.android.bluetooth.a2dpsink.A2dpSinkService;
		import com.android.bluetooth.btservice.MetricsLogger;
		import com.android.bluetooth.btservice.ProfileService;
		import com.android.internal.util.State;
		import com.android.internal.util.StateMachine;
		import com.android.bluetooth.statemachine.State;
		import com.android.bluetooth.statemachine.StateMachine;

		import java.util.ArrayList;
		import java.util.List;

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@ import android.bluetooth.BluetoothAdapter;
		import android.os.Message;
		import android.util.Log;

		import com.android.internal.util.State;
		import com.android.internal.util.StateMachine;
		import com.android.bluetooth.statemachine.State;
		import com.android.bluetooth.statemachine.StateMachine;

		/**
		* This state machine handles Bluetooth Adapter State.

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,9 +36,9 @@ import com.android.bluetooth.hfp.HeadsetService;
		import com.android.bluetooth.hfpclient.HeadsetClientService;
		import com.android.bluetooth.hid.HidHostService;
		import com.android.bluetooth.pbapclient.PbapClientService;
		import com.android.bluetooth.statemachine.State;
		import com.android.bluetooth.statemachine.StateMachine;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.State;
		import com.android.internal.util.StateMachine;

		import java.util.ArrayList;
		import java.util.HashSet;