diff options
| author | 2022-08-24 16:27:14 +0000 | |
|---|---|---|
| committer | 2022-08-24 16:27:14 +0000 | |
| commit | 02f87ae0ffc157fca9b9d2dca73d106930dbf273 (patch) | |
| tree | eb0dceb0596eda8ee8e45451323a638c2f69ec50 | |
| parent | cec0fc3e98b83789c3630214f734d571a03ee74b (diff) | |
| parent | 1ef0eb669232a5b98db284d43ccd8287f3d7153a (diff) | |
Merge "libbinder: BBinder descriptor"
| -rw-r--r-- | libs/binder/Binder.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libs/binder/Binder.cpp b/libs/binder/Binder.cpp index 1dc62334cb..402995717c 100644 --- a/libs/binder/Binder.cpp +++ b/libs/binder/Binder.cpp @@ -283,11 +283,9 @@ status_t BBinder::pingBinder() const String16& BBinder::getInterfaceDescriptor() const { - // This is a local static rather than a global static, - // to avoid static initializer ordering issues. - static String16 sEmptyDescriptor; - ALOGW("reached BBinder::getInterfaceDescriptor (this=%p)", this); - return sEmptyDescriptor; + static StaticString16 sBBinder(u"BBinder"); + ALOGW("Reached BBinder::getInterfaceDescriptor (this=%p). Override?", this); + return sBBinder; } // NOLINTNEXTLINE(google-default-arguments) |