Merge "Add backwards compatible versions of IInterface::asBinder()"

This commit is contained in:
Marco Nelissen 2015-03-31 22:10:47 +00:00 committed by Android (Google) Code Review
commit b1b2193680

View File

@ -14,6 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
#define LOG_TAG "IInterface"
#include <utils/Log.h>
#include <binder/IInterface.h> #include <binder/IInterface.h>
namespace android { namespace android {
@ -41,6 +43,25 @@ sp<IBinder> IInterface::asBinder(const sp<IInterface>& iface)
return iface->onAsBinder(); return iface->onAsBinder();
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
}; // namespace android }; // namespace android
extern "C" {
void _ZN7android10IInterface8asBinderEv(void *retval, void* self) {
ALOGW("deprecated asBinder call, please update your code");
//ALOGI("self: %p, retval: %p", self, retval);
android::sp<android::IBinder> *ret = new(retval) android::sp<android::IBinder>;
*ret = android::IInterface::asBinder((android::IInterface*)self);
}
void _ZNK7android10IInterface8asBinderEv(void *retval, void *self) {
ALOGW("deprecated asBinder call, please update your code");
//ALOGI("self: %p, retval: %p", self, retval);
android::sp<android::IBinder> *ret = new(retval) android::sp<android::IBinder>;
*ret = android::IInterface::asBinder((android::IInterface*)self);
}
} // extern "C"