diff options
| author | Michael Richardson <mcr@credil.org> | 2009-11-03 17:01:28 -0500 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-04-20 14:14:30 -0700 |
| commit | a3a884d9e298557b1540b33cab69271f521653c2 (patch) | |
| tree | 2ff6ee33a27da80e4407256b5d151c630e8a36bd /include | |
| parent | be0807b3433aa884f4b45236a91d4cdefa9ffc18 (diff) | |
| download | frameworks_native-a3a884d9e298557b1540b33cab69271f521653c2.zip frameworks_native-a3a884d9e298557b1540b33cab69271f521653c2.tar.gz frameworks_native-a3a884d9e298557b1540b33cab69271f521653c2.tar.bz2 | |
Allow META* macros outside of the framework
The META* macros are useful outside of the framework
for other systems implementing Binder interfaces, but
they depend upon the android namespace. This includes
the appropriate namespace operations, which should be
sane even in that android namespace.
Change-Id: If600156c65191f51f487d0ee301d9f9f532b263d
Diffstat (limited to 'include')
| -rw-r--r-- | include/binder/IInterface.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/include/binder/IInterface.h b/include/binder/IInterface.h index 273d922..5f9f69c 100644 --- a/include/binder/IInterface.h +++ b/include/binder/IInterface.h @@ -72,21 +72,24 @@ protected: // ---------------------------------------------------------------------- #define DECLARE_META_INTERFACE(INTERFACE) \ - static const String16 descriptor; \ - static sp<I##INTERFACE> asInterface(const sp<IBinder>& obj); \ - virtual const String16& getInterfaceDescriptor() const; \ + static const android::String16 descriptor; \ + static android::sp<I##INTERFACE> asInterface( \ + const android::sp<android::IBinder>& obj); \ + virtual const android::String16& getInterfaceDescriptor() const; \ I##INTERFACE(); \ virtual ~I##INTERFACE(); \ #define IMPLEMENT_META_INTERFACE(INTERFACE, NAME) \ - const String16 I##INTERFACE::descriptor(NAME); \ - const String16& I##INTERFACE::getInterfaceDescriptor() const { \ + const android::String16 I##INTERFACE::descriptor(NAME); \ + const android::String16& \ + I##INTERFACE::getInterfaceDescriptor() const { \ return I##INTERFACE::descriptor; \ } \ - sp<I##INTERFACE> I##INTERFACE::asInterface(const sp<IBinder>& obj) \ + android::sp<I##INTERFACE> I##INTERFACE::asInterface( \ + const android::sp<android::IBinder>& obj) \ { \ - sp<I##INTERFACE> intr; \ + android::sp<I##INTERFACE> intr; \ if (obj != NULL) { \ intr = static_cast<I##INTERFACE*>( \ obj->queryLocalInterface( \ |