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/BpBinder.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/BpBinder.h')
| -rw-r--r-- | include/binder/BpBinder.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/binder/BpBinder.h b/include/binder/BpBinder.h index 067637e..7ef93aa 100644 --- a/include/binder/BpBinder.h +++ b/include/binder/BpBinder.h @@ -31,7 +31,7 @@ public: inline int32_t handle() const { return mHandle; } - 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); @@ -106,6 +106,7 @@ private: }; void reportOneDeath(const Obituary& obit); + bool isDescriptorCached() const; mutable Mutex mLock; volatile int32_t mAlive; @@ -113,6 +114,7 @@ private: Vector<Obituary>* mObituaries; ObjectManager mObjects; Parcel* mConstantData; + mutable String16 mDescriptorCache; }; }; // namespace android |