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

Commit c5932ab2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 9da895b5 300f9d0b

services/core/java/com/android/server/connectivity/tethering/OffloadHardwareInterface.java

+4 −0
Original line number Diff line number Diff line
@@ -109,6 +109,10 @@ public class OffloadHardwareInterface { 
                mLog.e("tethering offload control not supported: " + e);

                return false;

            }

            if (mOffloadControl == null) {

                mLog.e("tethering IOffloadControl.getService() returned null");

                return false;

            }

        }



        final String logmsg = String.format("initOffloadControl(%s)",

services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp

+3 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static jboolean android_server_connectivity_tethering_OffloadHardwareInterface_c 
    hidl_handle h1(handleFromFileDescriptor(std::move(fd1))),

                h2(handleFromFileDescriptor(std::move(fd2)));



    bool rval;

    bool rval(false);

    hidl_string msg;

    const auto status = configInterface->setHandles(h1, h2,

            [&rval, &msg](bool success, const hidl_string& errMsg) {
@@ -123,6 +123,8 @@ static jboolean android_server_connectivity_tethering_OffloadHardwareInterface_c 
    if (!status.isOk() || !rval) {

        ALOGE("IOffloadConfig::setHandles() error: '%s' / '%s'",

              status.description().c_str(), msg.c_str());

        // If status is somehow not ok, make sure rval captures this too.

        rval = false;

    }



    return rval;