diff options
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | android/app/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 9142bd51ae..b787fa0f01 100644 --- a/Android.bp +++ b/Android.bp @@ -115,6 +115,7 @@ java_defaults { "-Xep:ClassCanBeStatic:ERROR", "-Xep:DateFormatConstant:ERROR", "-Xep:DirectInvocationOnMock:ERROR", + "-Xep:DuplicateBranches:ERROR", "-Xep:EmptyBlockTag:ERROR", "-Xep:EmptyCatch:ERROR", "-Xep:EnumOrdinal:ERROR", diff --git a/android/app/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java b/android/app/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java index fa010889ef..123cf5eb7a 100644 --- a/android/app/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java +++ b/android/app/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java @@ -649,8 +649,6 @@ public class HeadsetClientStateMachine extends StateMachine { action = HeadsetClientHalConstants.CALL_ACTION_CHLD_1; } else if (getCall(HfpClientCall.CALL_STATE_ACTIVE) != null) { action = HeadsetClientHalConstants.CALL_ACTION_CHLD_3; - } else if (flag == BluetoothHeadsetClient.CALL_ACCEPT_NONE) { - action = HeadsetClientHalConstants.CALL_ACTION_CHLD_2; } else { action = HeadsetClientHalConstants.CALL_ACTION_CHLD_2; } |