commit c3892c045ff82d57b9e584acdf32a2d7e1652f33
author Tom Cherry <tomcherry@google.com> Fri Mar 02 01:12:32 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 02 01:12:32 2018 +0000
tree 953f27ebd3822c5f43a06192072dcc041c57d546
parent a281389bf4b52bdbb7430ffec723a23e41606352
parent dc375869abb56a0ef8ee1299443866da1e76abb6

Merge "Restrict setting platform properties from vendor .prop files"

adb/client/main.cpp

diff --git a/adb/client/main.cpp b/adb/client/main.cpp
index e5666bc..31cb853 100644
--- a/adb/client/main.cpp
+++ b/adb/client/main.cpp
@@ -77,6 +77,7 @@
 
 static void intentionally_leak() {
     void* p = ::operator new(1);
+    // The analyzer is upset about this leaking. NOLINTNEXTLINE
     LOG(INFO) << "leaking pointer " << p;
 }
 

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index 560f490..b8af2f0 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -198,7 +198,7 @@
 
 int LogBuffer::log(log_id_t log_id, log_time realtime, uid_t uid, pid_t pid,
                    pid_t tid, const char* msg, unsigned short len) {
-    if ((log_id >= LOG_ID_MAX) || (log_id < 0)) {
+    if (log_id >= LOG_ID_MAX) {
         return -EINVAL;
     }