From 9dedd439ab19254eb0600ff8db74c1a891e6b731 Mon Sep 17 00:00:00 2001 From: David Gross Date: Tue, 27 Aug 2019 12:20:50 -0700 Subject: [PATCH] Fix V1_2::IDevice::getType documentation: was @param instead of @return Bug: 124346013 Test: $ cd neuralnetworks/1.2 ; mma Change-Id: I45d1320a9edae73cde7d9ccaca57b5b9519b0210 Merged-In: I45d1320a9edae73cde7d9ccaca57b5b9519b0210 (cherry picked from commit c7cdd550a01191898bc11a7711bbcfc4caf7b241) --- current.txt | 1 + neuralnetworks/1.2/IDevice.hal | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/current.txt b/current.txt index 50ac716a78..5c4fdf9b9c 100644 --- a/current.txt +++ b/current.txt @@ -479,6 +479,7 @@ b53ac9d61c24efb16a2d63a861cef20680f6d57adb244a03b9778c675550628b android.hardwar # ABI preserving changes to HALs during Android R b69a7615c508acf5c5201efd1bfa3262167874fc3594e2db5a3ff93addd8ac75 android.hardware.keymaster@4.0::IKeymasterDevice ad431c8de51c07934a068e3043d8dd0537ac4d3158627706628b123f42df48dc android.hardware.neuralnetworks@1.0::IPreparedModel +fb382e986c10b8fbb797a8546e8f9ea6d1107bfe6f3fb7e57f6bbbf1f807a906 android.hardware.neuralnetworks@1.2::IDevice aafcc10cf04ab247e86d4582586c71c6b4c2b8c479241ffa7fe37deb659fc942 android.hardware.neuralnetworks@1.2::IPreparedModel 1a6e2bd289f22931c526b21916910f1d4c436b7acb9556e4243de4ce8e6cc2e4 android.hardware.soundtrigger@2.0::ISoundTriggerHwCallback fd65298e1e09e0e3c781ab18305920d757dbe55a3b459ce17814ec5cf6dfee99 android.hardware.wifi@1.0::IWifiP2pIface diff --git a/neuralnetworks/1.2/IDevice.hal b/neuralnetworks/1.2/IDevice.hal index d83f9e6758..ff20c12867 100644 --- a/neuralnetworks/1.2/IDevice.hal +++ b/neuralnetworks/1.2/IDevice.hal @@ -64,14 +64,14 @@ interface IDevice extends @1.1::IDevice { * results, the developer could choose an ACCELERATOR type device for ML * workloads, and reserve GPU for graphical rendering. * - * @param status Error status returned from querying the device type. Must be: - * - NONE if the query was successful - * - DEVICE_UNAVAILABLE if driver is offline or busy - * - GENERAL_FAILURE if the query resulted in an - * unspecified error - * @param type The DeviceType of the device. Please note, this is not a - * bitfield of DeviceTypes. Each device must only be of a - * single DeviceType. + * @return status Error status returned from querying the device type. Must be: + * - NONE if the query was successful + * - DEVICE_UNAVAILABLE if driver is offline or busy + * - GENERAL_FAILURE if the query resulted in an + * unspecified error + * @return type The DeviceType of the device. Please note, this is not a + * bitfield of DeviceTypes. Each device must only be of a + * single DeviceType. */ getType() generates (ErrorStatus status, DeviceType type);