commit fa4c311438dc174df7acac822a9aa91ae91e9879
author Mark Salyzyn <salyzyn@google.com> Mon Oct 24 16:12:43 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 24 16:12:43 2016 +0000
tree 7f2be7e8f15e2470fc1062d0fc4af6fdddfd4b76
parent 03db8e4b58342d5ada64f29b049cf30da0ba9369
parent 5be5a41170aadc955fa03537f52235922f837be2

Merge "PdfEditor: define LOG_TAG" am: a3bb8e3cc7 am: 9c0ea2d1cd am: 5aad37e70c
am: 5be5a41170

Change-Id: Ia7ee2481592d3df55c3fda94cc1abfb4ea4a95cc

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 b5960dd..b142925 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 "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 @@
             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;