diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-04-21 09:15:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-21 09:15:15 -0700 |
| commit | a327dcfd79161c7fe48372f35d02918fca04af50 (patch) | |
| tree | 05304c8d792772cbb98c0bd2b3283e1a3bf96553 /include | |
| parent | 9318b6088dd323d391f76889ad2733c751688d9a (diff) | |
| parent | fc821e5d26c6273e667b15d52e3fb691e2e53f87 (diff) | |
| download | frameworks_native-a327dcfd79161c7fe48372f35d02918fca04af50.zip frameworks_native-a327dcfd79161c7fe48372f35d02918fca04af50.tar.gz frameworks_native-a327dcfd79161c7fe48372f35d02918fca04af50.tar.bz2 | |
am f021d12f: merge from open-source master
Merge commit 'f021d12f6f7116e9275cd3553a349ce5cb8aab14' into kraken
* commit 'f021d12f6f7116e9275cd3553a349ce5cb8aab14':
Allow META* macros outside of the framework
Fix printing order of phone objects creation
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( \ |