Merge "vibrator extension: use checked_interface_cast" am: 741347b49d am: 19d121b611

am: 6d77b339f5

Change-Id: I77dfe60e90e06eea95226cbce544cf46183a3fd7
This commit is contained in:
Steven Moreland 2019-11-25 10:54:50 -08:00 committed by android-build-merger
commit 4f0b0f2159

View file

@ -20,9 +20,9 @@
#include <binder/IServiceManager.h> #include <binder/IServiceManager.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
using android::checked_interface_cast;
using android::IBinder; using android::IBinder;
using android::IInterface; using android::IInterface;
using android::interface_cast;
using android::OK; using android::OK;
using android::sp; using android::sp;
using android::waitForVintfService; using android::waitForVintfService;
@ -44,7 +44,7 @@ TEST(Cpp, CallExtMethod) {
// getting the extension // getting the extension
sp<IBinder> ext; sp<IBinder> ext;
ASSERT_EQ(OK, IInterface::asBinder(vib)->getExtension(&ext)); ASSERT_EQ(OK, IInterface::asBinder(vib)->getExtension(&ext));
sp<ICustomVibrator> cvib = interface_cast<ICustomVibrator>(ext); sp<ICustomVibrator> cvib = checked_interface_cast<ICustomVibrator>(ext);
ASSERT_NE(nullptr, cvib.get()); ASSERT_NE(nullptr, cvib.get());
// calling extension method // calling extension method