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

Commit fd021182 authored by Chen Chen's avatar Chen Chen
Browse files

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

Copying IState, State and StateMachine class, and StateMachine test.
Modify the test code to use AndroidJUnit4, same as other BT tests.
All classes are marked hidden

Bug:146075686
Test: Build, test listening, talking, headset controlling on music,
video, audio, and mixing situation. Make atest StateMachineTest fail and
successful
Change-Id: I226fb7e73d5d0462050a5f30cf2a06518aa1c193
parent b777bb2d

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;