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

Commit e4402499 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 06ef1d21: am 9f0fa1f4: Merge branch \'eclair-mr2\' of... 

am 06ef1d21: am 9f0fa1f4: Merge branch \'eclair-mr2\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2

Merge commit '06ef1d2104b4c90d5b134ae17e2562fd6bedda17'

* commit '06ef1d2104b4c90d5b134ae17e2562fd6bedda17':
  Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
parents ceb9ce66 f28bdcfa

media/libstagefright/omx/OMXSoftwareCodecsPlugin.cpp

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ OMX_ERRORTYPE OMXSoftwareCodecsPlugin::enumerateComponents( 
        return OMX_ErrorNoMore;

    }



    strlcpy(name, kComponentInfos[index].mName, size);

    strncpy(name, kComponentInfos[index].mName, size - 1);

    name[size - 1] = '\0';



    return OMX_ErrorNone;

}