diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-27 14:34:50 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-27 14:34:50 -0700 |
| commit | 2da99bdaa1712f00525e6a84b58044332cb1baef (patch) | |
| tree | ed330500de06dc645769ea87372fb624390b52a8 /include/binder/Binder.h | |
| parent | 947f4f4d384ea26eb2145cc070a3eed42c59534a (diff) | |
| parent | cc77841f643751fd9f128e90f7d1587445ef353e (diff) | |
| download | frameworks_base-2da99bdaa1712f00525e6a84b58044332cb1baef.zip frameworks_base-2da99bdaa1712f00525e6a84b58044332cb1baef.tar.gz frameworks_base-2da99bdaa1712f00525e6a84b58044332cb1baef.tar.bz2 | |
Merge commit 'goog/master' into merge_master
Conflicts:
include/ui/Rect.h
libs/ui/ISurfaceComposer.cpp
Diffstat (limited to 'include/binder/Binder.h')
| -rw-r--r-- | include/binder/Binder.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/binder/Binder.h b/include/binder/Binder.h index c9b71fd..47b2bb9 100644 --- a/include/binder/Binder.h +++ b/include/binder/Binder.h @@ -27,7 +27,7 @@ class BBinder : public IBinder public: BBinder(); - virtual String16 getInterfaceDescriptor() const; + virtual const String16& getInterfaceDescriptor() const; virtual bool isBinderAlive() const; virtual status_t pingBinder(); virtual status_t dump(int fd, const Vector<String16>& args); @@ -71,6 +71,7 @@ private: Extras* mExtras; void* mReserved0; + static String16 sEmptyDescriptor; }; // --------------------------------------------------------------------------- |