Merge "Fix questionable condition"
diff --git a/cmds/lshal/ListCommand.cpp b/cmds/lshal/ListCommand.cpp
index 8d5f0d2..a6d7a78 100644
--- a/cmds/lshal/ListCommand.cpp
+++ b/cmds/lshal/ListCommand.cpp
@@ -498,7 +498,7 @@
}
}
out << "-->" << std::endl;
- out << vintf::gHalManifestConverter(manifest, vintf::SerializeFlag::HALS_ONLY);
+ out << vintf::gHalManifestConverter(manifest, vintf::SerializeFlags::HALS_ONLY);
}
std::string ListCommand::INIT_VINTF_NOTES{
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 786b136..b2a304a 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -120,7 +120,6 @@
"liblog",
"libcutils",
"libutils",
- "libutilscallstack",
],
header_libs: [
diff --git a/libs/binder/IMemory.cpp b/libs/binder/IMemory.cpp
index 7afec45..507ce53 100644
--- a/libs/binder/IMemory.cpp
+++ b/libs/binder/IMemory.cpp
@@ -31,7 +31,6 @@
#include <binder/Parcel.h>
#include <log/log.h>
-#include <utils/CallStack.h>
#include <utils/KeyedVector.h>
#include <utils/threads.h>
@@ -264,7 +263,6 @@
if (VERBOSE) {
ALOGD("UNMAPPING binder=%p, heap=%p, size=%zu, fd=%d",
binder.get(), this, mSize, heapId);
- CallStack stack(LOG_TAG);
}
munmap(mBase, mSize);
diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp
index c44a17e..4ba6c2a 100644
--- a/libs/binder/IServiceManager.cpp
+++ b/libs/binder/IServiceManager.cpp
@@ -27,7 +27,6 @@
#include <cutils/properties.h>
#include <utils/String8.h>
#include <utils/SystemClock.h>
-#include <utils/CallStack.h>
#include <private/binder/Static.h>
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 4b95036..8310455 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4630,10 +4630,10 @@
}
}
- // This code is used for IBinder protocol to interrogate the recipient
- // side of the transaction for its canonical interface descriptor. We
- // can let it pass by default.
- if (code == IBinder::INTERFACE_TRANSACTION) {
+ // These codes are used for the IBinder protocol to either interrogate the recipient
+ // side of the transaction for its canonical interface descriptor or to dump its state.
+ // We let them pass by default.
+ if (code == IBinder::INTERFACE_TRANSACTION || code == IBinder::DUMP_TRANSACTION) {
return OK;
}
// Numbers from 1000 to 1029 are currently use for backdoors. The code