Merge "PdfEditor: define LOG_TAG" am: a3bb8e3cc7 am: 9c0ea2d1cd am: 5aad37e70c (fa4c3114) · Commits · e / os / android_frameworks_base

core/jni/android/graphics/pdf/PdfEditor.cpp

+10 −7

Original line number	Diff line number	Diff line
		@@ -13,6 +13,15 @@
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		#define LOG_TAG "PdfEditor"

		#include <sys/types.h>
		#include <unistd.h>

		#include <vector>

		#include <android/log.h>
		#include <utils/Log.h>

		#include "PdfUtils.h"

		@@ -30,11 +39,6 @@
		#include "SkMatrix.h"

		#include <core_jni_helpers.h>
		#include <vector>
		#include <utils/Log.h>
		#include <unistd.h>
		#include <sys/types.h>
		#include <unistd.h>

		namespace android {

		@@ -77,8 +81,7 @@ static bool writeAllBytes(const int fd, const void* buffer, const size_t byteCou
		if (errno == EINTR) {
		continue;
		}
		__android_log_print(ANDROID_LOG_ERROR, LOG_TAG,
		"Error writing to buffer: %d", errno);
		ALOGE("Error writing to buffer: %d", errno);
		return false;
		}
		remainingBytes -= writtenByteCount;