Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check for IControllOffload.getServer() returning null"

Browse Source
This commit is contained in:
Treehugger Robot
2017-09-12 06:10:45 +00:00
committed by Gerrit Code Review
parent 9da895b5e1 300f9d0bf2
commit c5932ab2a8
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/connectivity/tethering/OffloadHardwareInterface.java
View File

@@ -109,6 +109,10 @@ public class OffloadHardwareInterface {
mLog.e("tethering offload control not supported: " + e); mLog.e("tethering offload control not supported: " + e);
return false; return false;
} }
if (mOffloadControl == null) {
mLog.e("tethering IOffloadControl.getService() returned null");
return false;
}
} }
final String logmsg = String.format("initOffloadControl(%s)", final String logmsg = String.format("initOffloadControl(%s)",

4
services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp
View File

@@ -113,7 +113,7 @@ static jboolean android_server_connectivity_tethering_OffloadHardwareInterface_c
hidl_handle h1(handleFromFileDescriptor(std::move(fd1))), hidl_handle h1(handleFromFileDescriptor(std::move(fd1))),
h2(handleFromFileDescriptor(std::move(fd2))); h2(handleFromFileDescriptor(std::move(fd2)));
bool rval; bool rval(false);
hidl_string msg; hidl_string msg;
const auto status = configInterface->setHandles(h1, h2, const auto status = configInterface->setHandles(h1, h2,
[&rval, &msg](bool success, const hidl_string& errMsg) { [&rval, &msg](bool success, const hidl_string& errMsg) {
@@ -123,6 +123,8 @@ static jboolean android_server_connectivity_tethering_OffloadHardwareInterface_c
if (!status.isOk() || !rval) { if (!status.isOk() || !rval) {
ALOGE("IOffloadConfig::setHandles() error: '%s' / '%s'", ALOGE("IOffloadConfig::setHandles() error: '%s' / '%s'",
status.description().c_str(), msg.c_str()); status.description().c_str(), msg.c_str());
// If status is somehow not ok, make sure rval captures this too.
rval = false;
} }
return rval; return rval;