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

Commit 681cafd3 authored by William Escande's avatar William Escande
Browse files

Remove StateMachine files from Bluetooth code base 

State machine are linked with a static library to the modules utils
statemachine files provided.
This is done in the continuity of mainline process

Bug: 196435634
Bug: 190440540
Tag: #refactor
Test: atest BluetoothInstrumentationTests:A2dpStateMachineTest BluetoothInstrumentationTests:AvrcpControllerStateMachineTest BluetoothInstrumentationTests:BondStateMachineTest BluetoothInstrumentationTests:HearingAidStateMachineTest BluetoothInstrumentationTests:HeadsetServiceAndStateMachineTest BluetoothInstrumentationTests:HeadsetStateMachineTest BluetoothInstrumentationTests:HeadsetClientStateMachineTest BluetoothInstrumentationTests:LeAudioStateMachineTest BluetoothInstrumentationTests:MapClientStateMachineTest BluetoothInstrumentationTests:PbapStateMachineTest BluetoothInstrumentationTests:VolumeControlStateMachineTest
Ignore-AOSP-First: Merge conflict resolution
Change-Id: I06639d6c65271b2623deda7f0f65e5f50a33403e
parent 5fea601b

android/app/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,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 −3
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ package com.android.bluetooth.a2dp; 


import static android.Manifest.permission.BLUETOOTH_CONNECT;



import android.annotation.RequiresPermission;

import android.bluetooth.BluetoothA2dp;

import android.bluetooth.BluetoothCodecConfig;

import android.bluetooth.BluetoothCodecStatus;
@@ -60,9 +59,9 @@ import android.util.Log; 


import com.android.bluetooth.Utils;

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
@@ -31,8 +31,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
@@ -38,9 +38,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.