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

Commit 0b75bd6a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove StateMachine files from Bluetooth code base"

parents 79154c2c f300e448

android/app/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ android_app { 
        "androidx.core_core",

        "androidx.legacy_legacy-support-v4",

        "androidx.lifecycle_lifecycle-livedata",

        "modules-utils-statemachine",

        "androidx.room_room-runtime",

        "guava",

        "android.hardware.radio-V1.0-java",

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

+2 −2
Original line number Diff line number Diff line
@@ -56,9 +56,9 @@ import android.os.Message; 
import android.util.Log;



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.bluetooth.statemachine.State;

import com.android.bluetooth.statemachine.StateMachine;

import com.android.internal.util.State;

import com.android.internal.util.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
@@ -36,9 +36,9 @@ 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.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.List;

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

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ import android.util.Log; 


import com.android.bluetooth.R;

import com.android.bluetooth.telephony.BluetoothInCallService;

import com.android.bluetooth.statemachine.State;

import com.android.bluetooth.statemachine.StateMachine;

import com.android.internal.util.State;

import com.android.internal.util.StateMachine;



/**

 * This state machine handles Bluetooth Adapter State.