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

Commit 7a4a65d6 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "hidl_test_java interfaces: use generic interfaces" am: 730aef9a am:... 

Merge "hidl_test_java interfaces: use generic interfaces" am: 730aef9a am: 10f1f668 am: 1acc5679 am: 5b436e33

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1445778

Change-Id: If5afd00334e8b09250df1ae97dec9285e39ad930
parents e9492eaf 5b436e33

tests/baz/1.0/IBaz.hal

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ interface IBaz extends IBase { 
        int8_t[7] array;

        string oneString;

        vec<string> vectorOfStrings;

        IBase dummy;

        interface iface;

    };

    oneway doThis(float param);

tests/safeunion/1.0/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ hidl_interface { 
    name: "android.hardware.tests.safeunion@1.0",

    root: "android.hardware",

    srcs: [

        "IOtherInterface.hal",

        "ISafeUnion.hal",

    ],

    interfaces: [

tests/safeunion/1.0/IOtherInterface.hal

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.hardware.tests.safeunion@1.0;



interface IOtherInterface {

    concatTwoStrings(string a, string b) generates (string result);

};

tests/safeunion/1.0/ISafeUnion.hal

+2 −4
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package android.hardware.tests.safeunion@1.0;



import IOtherInterface;



import android.hidl.safe_union@1.0::Monostate;



interface ISafeUnion {
@@ -73,7 +71,7 @@ interface ISafeUnion { 


        uint32_t a;

        int8_t[7] b;

        IOtherInterface c;

        interface c;

        string d;

        vec<string> e;

        handle f;
@@ -107,7 +105,7 @@ interface ISafeUnion { 
    newInterfaceTypeSafeUnion() generates (InterfaceTypeSafeUnion myUnion);

    setInterfaceA(InterfaceTypeSafeUnion myUnion, uint32_t a) generates (InterfaceTypeSafeUnion myUnion);

    setInterfaceB(InterfaceTypeSafeUnion myUnion, int8_t[7] b) generates (InterfaceTypeSafeUnion myUnion);

    setInterfaceC(InterfaceTypeSafeUnion myUnion, IOtherInterface c) generates (InterfaceTypeSafeUnion myUnion);

    setInterfaceC(InterfaceTypeSafeUnion myUnion, interface c) generates (InterfaceTypeSafeUnion myUnion);

    setInterfaceD(InterfaceTypeSafeUnion myUnion, string d) generates (InterfaceTypeSafeUnion myUnion);

    setInterfaceE(InterfaceTypeSafeUnion myUnion, vec<string> e) generates (InterfaceTypeSafeUnion myUnion);

    setInterfaceF(InterfaceTypeSafeUnion myUnion, handle f) generates (InterfaceTypeSafeUnion myUnion);

tests/safeunion/1.0/default/SafeUnion.cpp

+3 −1
Original line number Diff line number Diff line
@@ -202,7 +202,9 @@ Return<void> SafeUnion::setInterfaceB(const InterfaceTypeSafeUnion& myUnion, con 
    return Void();

}



Return<void> SafeUnion::setInterfaceC(const InterfaceTypeSafeUnion& myUnion, const sp<::android::hardware::tests::safeunion::V1_0::IOtherInterface>& c, setInterfaceC_cb _hidl_cb) {

Return<void> SafeUnion::setInterfaceC(const InterfaceTypeSafeUnion& myUnion,

                                      const sp<::android::hidl::base::V1_0::IBase>& c,

                                      setInterfaceC_cb _hidl_cb) {

    LOG(INFO) << "SERVER(SafeUnion) setInterfaceC(myUnion, " << toString(c) << ")";



    InterfaceTypeSafeUnion myNewUnion = myUnion;