From c39d782a958690dffa1ca65478a3870eddd13dff Mon Sep 17 00:00:00 2001 From: Hongbo Zeng Date: Fri, 26 Feb 2021 21:48:12 +0800 Subject: [PATCH] move the fields in RouteSelectionDescriptorParams to RouteSelectionDescriptor Bug: 178075054 Test: full build pass Change-Id: I283514bd63cb3ae7c37d8e3d4740e38f7e79a09e Merged-In: I283514bd63cb3ae7c37d8e3d4740e38f7e79a09e --- current.txt | 2 +- radio/1.6/types.hal | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/current.txt b/current.txt index 88b067d63f..f58358f0b7 100644 --- a/current.txt +++ b/current.txt @@ -828,7 +828,7 @@ c17d9e27abd37ae5a8ff8da08fc5c9b13a264670feef6bbbc9d3ab1915216130 android.hardwar 3e8866987de4ecb48807c09d4c88ec38365930a22415f1b74edf8b14da17846b android.hardware.radio@1.6::IRadio 715789427a44cc78f9d123b0ceb9e035e4ac2b1049501337c23a512e85b87850 android.hardware.radio@1.6::IRadioIndication 2e9c08c4bc9539d8da28d7de33500f87148f7fa2e377238ee898b41752ac4f29 android.hardware.radio@1.6::IRadioResponse -6475887a9cd5cc8cb803e3a78956d84d7a5fde571407ede2396f3ea5e0c0d3ad android.hardware.radio@1.6::types +278e1997a379f2e93f0b7743c5bb28afb0cd6922915a760d58c2dd8177fde6ee android.hardware.radio@1.6::types f22813615be1445ddd817655c054fc69dc9efea56c9035cd0757f3cbed190641 android.hardware.radio.config@1.3::IRadioConfig c9ad18729268593d14681d88ffad1c97e707444a45e1b4ed804dab949edbd84f android.hardware.radio.config@1.3::IRadioConfigResponse 78dcb9a6975e8b377cb90bbe952078162960941468c992dcd2e1830a477b8c03 android.hardware.radio.config@1.3::types diff --git a/radio/1.6/types.hal b/radio/1.6/types.hal index 4b75db5e1e..d026589da0 100644 --- a/radio/1.6/types.hal +++ b/radio/1.6/types.hal @@ -1023,18 +1023,6 @@ struct RouteSelectionDescriptor { * precedence. */ uint8_t precedence; - /** - * Parameters defining this RouteSelectionDescriptor. The length of the vector - * must be >= 1. - */ - vec routeSelectionDescriptorParams; -}; - -/** - * This struct represents a route selection descriptor. A valid struct must have - * at least one of the vectors non-empty. - */ -struct RouteSelectionDescriptorParams { /** * Valid values are IP, IPV6 and IPV4V6. */