Commit f28bdcfa authored Dec 03, 2009 by Scott Main Committed by Android Git Automerger Dec 03, 2009

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

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

Merge commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e' into eclair-mr2-plus-aosp

* commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e':
  Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.

parents 9c0674d1 0ef47568

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;
		}