diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 4a442e6e..f3d9328e 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -479,7 +479,7 @@ int32_t CPhoneDevice::CJpegCamera::getOutputFormat() const } CPhoneDevice::CPhoneDevice(JavaVM* vm, jobject service, const std::string& appPath, unsigned int netId, unsigned int versionCode, const std::string& nativeLibDir) - : mVersionCode(versionCode), m_nativeLibraryDir(nativeLibDir), m_network(NULL), m_netHandle(NETWORK_UNSPECIFIED) + : mVersionCode(versionCode), m_nativeLibraryDir(nativeLibDir), m_network(NULL), m_ethnetHandle(NETWORK_UNSPECIFIED) { mCamera = NULL; m_listener = NULL; @@ -3748,7 +3748,7 @@ void CPhoneDevice::UpdateSimcard(const std::string& simcard) void CPhoneDevice::UpdateEthernet(net_handle_t nethandle, bool available) { m_devLocker.lock(); - m_netHandle = available ? nethandle : NETWORK_UNSPECIFIED; + m_ethnetHandle = available ? nethandle : NETWORK_UNSPECIFIED; m_devLocker.unlock(); XYLOG(XYLOG_SEVERITY_WARNING, "NET Handle: %lld", available ? (uint64_t)nethandle : 0); @@ -3758,7 +3758,7 @@ net_handle_t CPhoneDevice::GetNetHandle() const { net_handle_t nethandle = NETWORK_UNSPECIFIED; m_devLocker.lock(); - nethandle = m_netHandle; + nethandle = m_ethnetHandle; m_devLocker.unlock(); return nethandle; diff --git a/app/src/main/cpp/PhoneDevice.h b/app/src/main/cpp/PhoneDevice.h index be6f3961..ec07c831 100644 --- a/app/src/main/cpp/PhoneDevice.h +++ b/app/src/main/cpp/PhoneDevice.h @@ -354,7 +354,7 @@ protected: std::string m_nativeLibraryDir; NETWORK* m_network; - net_handle_t m_netHandle; + net_handle_t m_ethnetHandle; jmethodID mRegisterHeartbeatMid; jmethodID mUpdateCaptureScheduleMid;