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

Commit 40781c12 authored by Matthew Xie's avatar Matthew Xie Committed by Android (Google) Code Review
Browse files

Fix merge error, put in tmp workaround for input manager. 

Fix merge error, missing enableNoAutoConnect api.
Remove bluetoothF from inputManageF.systemReady call as tmp workaround.
Recover shutdownRadios(MAX_RADIO_WAIT_TIME) call in ShutdownThread

Change-Id: Ice2b5c54267755bdbf56c742feabbb8709b92570
parent d07368a6

framework/java/android/bluetooth/IBluetooth.aidl

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ interface IBluetooth 
    boolean isEnabled();

    int getState();

    boolean enable();

    boolean enableNoAutoConnect();

    boolean disable(boolean persist);



    String getAddress();