Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8723856c authored by Martijn Coenen's avatar Martijn Coenen Committed by android-build-merger
Browse files

Revert "Fix tests for using IBase instead of IBinder." am: 0dbb9903

am: 666a5dca

Change-Id: Ia1010cf130fc9b0103a4ce7c97c53dbf7a4cca36
parents c274091d 666a5dca
Loading
Loading
Loading
Loading
+1 −27
Original line number Diff line number Diff line
@@ -122,36 +122,10 @@ Return<void> Bar::haveAVectorOfInterfaces(
    return Void();
}

// TODO: remove after b/33173166 is fixed.
struct Simple : public ISimple {
    Simple(int32_t cookie)
        : mCookie(cookie) {
    }

    Return<int32_t> getCookie() override {
        return mCookie;
    }

private:
    int32_t mCookie;
};

// TODO: use _hidl_cb(in) after b/33173166 is fixed.
Return<void> Bar::haveAVectorOfGenericInterfaces(
        const hidl_vec<sp<android::hidl::base::V1_0::IBase> > &in,
        haveAVectorOfGenericInterfaces_cb _hidl_cb) {
    // _hidl_cb(in);
    hidl_vec<sp<android::hidl::base::V1_0::IBase> > out;
    out.resize(in.size());
    for (size_t i = 0; i < in.size(); ++i) {
        sp<ISimple> s = ISimple::castFrom(in[i]);
        if (s.get() == nullptr) {
            out[i] = new Simple(-1);
        } else {
            out[i] = new Simple(s->getCookie());
        }
    }
    _hidl_cb(out);
    _hidl_cb(in);

    return Void();
}