diff options
3 files changed, 5 insertions, 3 deletions
diff --git a/core/java/com/android/internal/nfc/LlcpServiceSocket.java b/core/java/com/android/internal/nfc/LlcpServiceSocket.java index 4607527..318982b 100644 --- a/core/java/com/android/internal/nfc/LlcpServiceSocket.java +++ b/core/java/com/android/internal/nfc/LlcpServiceSocket.java @@ -78,8 +78,9 @@ public class LlcpServiceSocket { * @param handle * The handle returned by the NFC service and used to identify * the socket in subsequent calls. + * @hide */ - LlcpServiceSocket(ILlcpServiceSocket service, ILlcpSocket socketService, int handle) { + public LlcpServiceSocket(ILlcpServiceSocket service, ILlcpSocket socketService, int handle) { this.mService = service; this.mHandle = handle; this.mLlcpSocketService = socketService; diff --git a/core/java/com/android/internal/nfc/LlcpSocket.java b/core/java/com/android/internal/nfc/LlcpSocket.java index ae74002..b1b1320 100644 --- a/core/java/com/android/internal/nfc/LlcpSocket.java +++ b/core/java/com/android/internal/nfc/LlcpSocket.java @@ -78,8 +78,9 @@ public class LlcpSocket { * @param handle * The handle returned by the NFC service and used to identify * the socket in subsequent calls. + * @hide */ - LlcpSocket(ILlcpSocket service, int handle) { + public LlcpSocket(ILlcpSocket service, int handle) { this.mService = service; this.mHandle = handle; } diff --git a/telephony/java/com/android/internal/telephony/CallManager.java b/telephony/java/com/android/internal/telephony/CallManager.java index ab7b601..5f9a3e7 100644 --- a/telephony/java/com/android/internal/telephony/CallManager.java +++ b/telephony/java/com/android/internal/telephony/CallManager.java @@ -380,7 +380,7 @@ public final class CallManager { break; case OFFHOOK: Phone fgPhone = getFgPhone(); - if (!(fgPhone instanceof SipPhone)) { + if (hasActiveFgCall() && !(fgPhone instanceof SipPhone)) { mode = AudioManager.MODE_IN_CALL; } break; |