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

Commit 197b62d3 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "hidl getService throw correct exceptions." 

am: 5d5ace5e

Change-Id: I16bcf1b32914ef42bbe788a8b67e92f6fe9d04a2
parents 50a15e7f 5d5ace5e

core/jni/android_os_HwBinder.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -370,7 +370,7 @@ static jobject JHwBinder_native_getService( 
    if (transport != IServiceManager::Transport::HWBINDER && !vintfLegacy) {

    if (transport != IServiceManager::Transport::HWBINDER && !vintfLegacy) {

        LOG(ERROR) << "service " << ifaceName << " declares transport method "

        LOG(ERROR) << "service " << ifaceName << " declares transport method "

                   << toString(transport) << " but framework expects hwbinder.";

                   << toString(transport) << " but framework expects hwbinder.";

        signalExceptionForError(env, UNKNOWN_ERROR, true /* canThrowRemoteException */);

        signalExceptionForError(env, NAME_NOT_FOUND, true /* canThrowRemoteException */);

        return NULL;

        return NULL;

    }

    }