summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-11-17 18:52:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-17 18:52:56 +0000
commite12cfc23b2399ded0cc4608e47c5ba864fc5ab7d (patch)
treefc9a48a13cd024ae51fd0175e796c1ecf6713bf3 /include
parent36ec7a8b99e287d923bfacd2ef69661818aeb85e (diff)
parent55f71bc0800b9ec7a779c5d30d5a90e074c2526b (diff)
downloadframeworks_native-e12cfc23b2399ded0cc4608e47c5ba864fc5ab7d.zip
frameworks_native-e12cfc23b2399ded0cc4608e47c5ba864fc5ab7d.tar.gz
frameworks_native-e12cfc23b2399ded0cc4608e47c5ba864fc5ab7d.tar.bz2
am 55f71bc0: Merge "Replace IInterface::asBinder() with a static"
* commit '55f71bc0800b9ec7a779c5d30d5a90e074c2526b': Replace IInterface::asBinder() with a static
Diffstat (limited to 'include')
-rw-r--r--include/binder/IInterface.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/binder/IInterface.h b/include/binder/IInterface.h
index 5f9f69c..4ce3613 100644
--- a/include/binder/IInterface.h
+++ b/include/binder/IInterface.h
@@ -28,9 +28,9 @@ class IInterface : public virtual RefBase
{
public:
IInterface();
- sp<IBinder> asBinder();
- sp<const IBinder> asBinder() const;
-
+ static sp<IBinder> asBinder(const IInterface*);
+ static sp<IBinder> asBinder(const sp<IInterface>&);
+
protected:
virtual ~IInterface();
virtual IBinder* onAsBinder() = 0;