diff options
| author | Dan Egnor <egnor@google.com> | 2010-05-06 17:33:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-06 17:33:45 -0700 |
| commit | ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f (patch) | |
| tree | ba82e7825548f05c8ac87f75adebcf6bf6a92bf9 /libs/binder/Binder.cpp | |
| parent | ad2f9ff786d83851c5aaccf0e8d49f50e58fb7dd (diff) | |
| parent | 8a8658a5de261c2da72d431940877bd054bc9837 (diff) | |
| download | frameworks_base-ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f.zip frameworks_base-ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f.tar.gz frameworks_base-ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f.tar.bz2 | |
am 8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo
Merge commit '8a8658a5de261c2da72d431940877bd054bc9837' into froyo-plus-aosp
* commit '8a8658a5de261c2da72d431940877bd054bc9837':
Make static versions of libutils and libbinder.
Diffstat (limited to 'libs/binder/Binder.cpp')
| -rw-r--r-- | libs/binder/Binder.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/binder/Binder.cpp b/libs/binder/Binder.cpp index 0dd7622..9945f91 100644 --- a/libs/binder/Binder.cpp +++ b/libs/binder/Binder.cpp @@ -69,8 +69,6 @@ public: // --------------------------------------------------------------------------- -String16 BBinder::sEmptyDescriptor; - BBinder::BBinder() : mExtras(NULL) { @@ -88,6 +86,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; LOGW("reached BBinder::getInterfaceDescriptor (this=%p)", this); return sEmptyDescriptor; } |