commit b7b2f86ac86d0181aabbf59cbb04ee829a9342d3
author Ben Fennema <fennema@google.com> Thu Jul 27 07:05:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 27 07:05:58 2017 +0000
tree 22880da14549c7d09093be423ae2f4f74b8a1c2f
parent edba48a720c4a64e60c65cf5f622f5252e3b6a7f
parent 9a23769f2d5c0eeb8251063cf98b040941c3d7c4

Merge "init: fix type of 2nd argument passed to prctl" am: 1b506c54c2 am: f01f4e9d4a am: ec7afe31a0
am: 2953e1af9b

Change-Id: I09b2790e3800bcad1c8639bc13e16a7c066b5477

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index fc64db6..e800d32 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -225,8 +225,8 @@
     if (capabilities_.any() && uid_) {
         // If Android is running in a container, some securebits might already
         // be locked, so don't change those.
-        int64_t securebits = prctl(PR_GET_SECUREBITS);
-        if (securebits == -1) {
+        unsigned long securebits = prctl(PR_GET_SECUREBITS);
+        if (securebits == -1UL) {
             PLOG(FATAL) << "prctl(PR_GET_SECUREBITS) failed for " << name_;
         }
         securebits |= SECBIT_KEEP_CAPS | SECBIT_KEEP_CAPS_LOCKED;