commit 213593af8a6039c507d68bfcaf7ee6cff59cf3e6
author Android Build Merger (Role) <android-build-merger@google.com> Mon Jun 12 20:00:28 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 12 20:00:29 2017 +0000
tree e171e21dbd7a3c1276c8f5335a08f5b9448d2986
parent a0329ef72c02d1ab5e0459054768e05e09377b00
parent 1fc926afd196bf0ca9b8c30aee4781014d528bde

Merge "Merge "Revert "Load default prop from /system/etc/prop.default"" into oc-dev am: 642ca632f6  -s ours am: 869f48a256" into oc-dr1-dev-plus-aosp

libcutils/sched_policy.cpp

diff --git a/libcutils/sched_policy.cpp b/libcutils/sched_policy.cpp
index 7170b48..3472a67 100644
--- a/libcutils/sched_policy.cpp
+++ b/libcutils/sched_policy.cpp
@@ -343,7 +343,7 @@
     return 0;
 }
 
-static void set_timerslack_ns(int tid, unsigned long long slack) {
+static void set_timerslack_ns(int tid, unsigned long slack) {
     // v4.6+ kernels support the /proc/<tid>/timerslack_ns interface.
     // TODO: once we've backported this, log if the open(2) fails.
     if (__sys_supports_timerslack) {
@@ -351,7 +351,7 @@
         snprintf(buf, sizeof(buf), "/proc/%d/timerslack_ns", tid);
         int fd = open(buf, O_WRONLY | O_CLOEXEC);
         if (fd != -1) {
-            int len = snprintf(buf, sizeof(buf), "%llu", slack);
+            int len = snprintf(buf, sizeof(buf), "%lu", slack);
             if (write(fd, buf, len) != len) {
                 SLOGE("set_timerslack_ns write failed: %s\n", strerror(errno));
             }