commit 1e05e099fcbad4a1077f2994d659ae504717c711
author Josh Gao <jmgao@google.com> Wed Feb 15 05:18:58 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 15 05:19:01 2017 +0000
tree a3b9f90679015bbfa28d14ad0626635d43c4ddcc
parent 523963217717d0924df663f9e11228dd644a9d14
parent 36a742da0260f302a89d994ad335914511d4f6bd

Merge changes I32567010,I400d5991

* changes:
  debuggerd_handler: raise capabilities before running crash_dump.
  crasher: add a case that uses PR_SET_NO_NEW_PRIVS.

base/Android.bp

diff --git a/base/Android.bp b/base/Android.bp
index a7600f3..694e029 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -37,9 +37,6 @@
     cppflags: libbase_cppflags,
     export_include_dirs: ["include"],
     shared_libs: ["liblog"],
-    sanitize: {
-        misc_undefined: ["integer"],
-    },
     target: {
         android: {
             srcs: [
@@ -47,6 +44,9 @@
                 "properties.cpp",
             ],
             cppflags: ["-Wexit-time-destructors"],
+            sanitize: {
+                misc_undefined: ["integer"],
+            },
         },
         darwin: {
             srcs: ["errors_unix.cpp"],
@@ -89,12 +89,12 @@
         "strings_test.cpp",
         "test_main.cpp",
     ],
-    sanitize: {
-        misc_undefined: ["integer"],
-    },
     target: {
         android: {
             srcs: ["properties_test.cpp"],
+            sanitize: {
+                misc_undefined: ["integer"],
+            },
         },
         windows: {
             srcs: ["utf8_test.cpp"],

liblog/logd_reader.c

diff --git a/liblog/logd_reader.c b/liblog/logd_reader.c
index 9411f36..ccc7da8 100644
--- a/liblog/logd_reader.c
+++ b/liblog/logd_reader.c
@@ -91,7 +91,7 @@
 
 static int logdAvailable(log_id_t logId)
 {
-    if (logId >= LOG_ID_MAX || logId == LOG_ID_KERNEL) {
+    if (logId > LOG_ID_KERNEL) {
         return -EINVAL;
     }
     if (logId == LOG_ID_SECURITY) {