commit 9c0ea2d1cd63ec0ee197108d41b83153056baba6
author Mark Salyzyn <salyzyn@google.com> Mon Oct 24 15:53:30 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 24 15:53:30 2016 +0000
tree 636f827b5d6ae6a95a0d197ad408838197332cab
parent e79cb5c81d7e75f29e59e750e8e222d01736c169
parent a3bb8e3cc7499c1278dd530414d1f0bc3bca7c14

Merge "PdfEditor: define LOG_TAG"
am: a3bb8e3cc7

Change-Id: Ide63ebe4228d7b7af05e20202baafdebf9699150

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

diff --git a/core/jni/android/graphics/pdf/PdfEditor.cpp b/core/jni/android/graphics/pdf/PdfEditor.cpp
index 0468b64..ac82457 100644
--- a/core/jni/android/graphics/pdf/PdfEditor.cpp
+++ b/core/jni/android/graphics/pdf/PdfEditor.cpp
@@ -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 "jni.h"
 #include "JNIHelp.h"
@@ -29,11 +38,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 {
 
@@ -139,8 +143,7 @@
             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;