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

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

Merge "Remove ignored annotations." am: 8523de75 am: 2bb38c61 am: 9404ba89 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66ea4ffd478100286b27299ef95714f90b8a1c6d
parents ea950562 9404ba89

current.txt

+3 −0
Original line number Diff line number Diff line
@@ -772,12 +772,15 @@ a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardwar 
2c331a9605f3a08d9c1e0a36169ca57758bc43c11a78ef3f3730509885e52c15 android.hardware.graphics.composer@2.4::IComposerClient

3da3ce039247872d95c6bd48621dbfdfa1c2d2a91a90f257862f87ee2bc46300 android.hardware.health@2.1::types

9679f27a42f75781c8993ef163ed92808a1928de186639834841d0b8e326e63d android.hardware.gatekeeper@1.0::IGatekeeper

9c4eb603d7b9ad675a14edb6180681c5a78da5c6bdc7755853912c974a21f7e5 android.hardware.gnss@1.0::IAGnssCallback

40456eb90ea88b62d18ad3fbf1da8917981cd55ac04ce69c8e058d49ff5beff4 android.hardware.keymaster@3.0::IKeymasterDevice

6017b4f2481feb0fffceae81c62bc372c898998b2d8fe69fbd39859d3a315e5e android.hardware.keymaster@4.0::IKeymasterDevice

dabe23dde7c9e3ad65c61def7392f186d7efe7f4216f9b6f9cf0863745b1a9f4 android.hardware.keymaster@4.1::IKeymasterDevice

cd84ab19c590e0e73dd2307b591a3093ee18147ef95e6d5418644463a6620076 android.hardware.neuralnetworks@1.2::IDevice

9625e85f56515ad2cf87b6a1847906db669f746ea4ab02cd3d4ca25abc9b0109 android.hardware.neuralnetworks@1.2::types

9e758e208d14f7256e0885d6d8ad0b61121b21d8c313864f981727ae55bffd16 android.hardware.neuralnetworks@1.3::types

e8c86c69c438da8d1549856c1bb3e2d1b8da52722f8235ff49a30f2cce91742c android.hardware.soundtrigger@2.1::ISoundTriggerHwCallback

b9fbb6e2e061ed0960939d48b785e9700210add1f13ed32ecd688d0f1ca20ef7 android.hardware.renderscript@1.0::types

0f53d70e1eadf8d987766db4bf6ae2048004682168f4cab118da576787def3fa android.hardware.radio@1.0::types

38d65fb20c60a5b823298560fc0825457ecdc49603a4b4e94bf81511790737da android.hardware.radio@1.4::types

954c334efd80e8869b66d1ce5fe2755712d96ba4b3c38d415739c330af5fb4cb android.hardware.radio@1.5::types

gnss/1.0/IAGnssCallback.hal

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ interface IAGnssCallback { 
    /**

     * Represents the status of AGNSS augmented to support IPv4.

     */

    @export(name="", value_prefix="GPS_")

    struct AGnssStatusIpV4 {

        AGnssType type;

        AGnssStatusValue status;

renderscript/1.0/types.hal

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ enum ForEachStrategy : int32_t { 
};



// Script to Script

@export(name="RsScriptCall")

struct ScriptCall {

    ForEachStrategy strategy;

    uint32_t        xStart;

soundtrigger/2.1/ISoundTriggerHwCallback.hal

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import @2.0::PhraseRecognitionExtra; 
/**

 * SoundTrigger HAL Callback interface. Obtained during SoundTrigger setup.

 */

@hidl_callback

interface ISoundTriggerHwCallback extends @2.0::ISoundTriggerHwCallback {



    /**