From 7aad611408d3c0fb71e1b664e5b31970ad1244e2 Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Sat, 10 Feb 2018 10:49:58 -0800 Subject: [PATCH] Drop broadcastradio HAL 1.2. Test: it boots Bug: 62945293 Change-Id: Ie05d50f3084f51aa6e4de53096656b1387503459 --- broadcastradio/1.1/vts/functional/Android.bp | 1 - broadcastradio/1.2/Android.bp | 25 ------- broadcastradio/1.2/IBroadcastRadioFactory.hal | 29 -------- broadcastradio/1.2/ITuner.hal | 70 ------------------- broadcastradio/1.2/ITunerCallback.hal | 36 ---------- broadcastradio/1.2/types.hal | 50 ------------- 6 files changed, 211 deletions(-) delete mode 100644 broadcastradio/1.2/Android.bp delete mode 100644 broadcastradio/1.2/IBroadcastRadioFactory.hal delete mode 100644 broadcastradio/1.2/ITuner.hal delete mode 100644 broadcastradio/1.2/ITunerCallback.hal delete mode 100644 broadcastradio/1.2/types.hal diff --git a/broadcastradio/1.1/vts/functional/Android.bp b/broadcastradio/1.1/vts/functional/Android.bp index 27ae4e9d39..9240cf0586 100644 --- a/broadcastradio/1.1/vts/functional/Android.bp +++ b/broadcastradio/1.1/vts/functional/Android.bp @@ -21,7 +21,6 @@ cc_test { static_libs: [ "android.hardware.broadcastradio@1.0", "android.hardware.broadcastradio@1.1", - "android.hardware.broadcastradio@1.2", // common-utils-lib dependency "android.hardware.broadcastradio@common-utils-1x-lib", "android.hardware.broadcastradio@vts-utils-lib", "libgmock", diff --git a/broadcastradio/1.2/Android.bp b/broadcastradio/1.2/Android.bp deleted file mode 100644 index 40eb4e0a63..0000000000 --- a/broadcastradio/1.2/Android.bp +++ /dev/null @@ -1,25 +0,0 @@ -// This file is autogenerated by hidl-gen -Landroidbp. - -hidl_interface { - name: "android.hardware.broadcastradio@1.2", - root: "android.hardware", - vndk: { - enabled: true, - }, - srcs: [ - "types.hal", - "IBroadcastRadioFactory.hal", - "ITuner.hal", - "ITunerCallback.hal", - ], - interfaces: [ - "android.hardware.broadcastradio@1.0", - "android.hardware.broadcastradio@1.1", - "android.hidl.base@1.0", - ], - types: [ - "IdentifierType", - ], - gen_java: false, -} - diff --git a/broadcastradio/1.2/IBroadcastRadioFactory.hal b/broadcastradio/1.2/IBroadcastRadioFactory.hal deleted file mode 100644 index 29f6ab35f1..0000000000 --- a/broadcastradio/1.2/IBroadcastRadioFactory.hal +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2017 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.broadcastradio@1.2; - -import @1.1::IBroadcastRadioFactory; - -/** - * To use 1.2 features you must cast specific interfaces returned from the - * 1.0 HAL. For example V1_0::IBroadcastRadio::openTuner() returns V1_0::ITuner, - * which can be cast with V1_2::ITuner::castFrom() call. - * - * The 1.2 server must always return the 1.2 version of specific interface. - */ -interface IBroadcastRadioFactory extends @1.1::IBroadcastRadioFactory { -}; diff --git a/broadcastradio/1.2/ITuner.hal b/broadcastradio/1.2/ITuner.hal deleted file mode 100644 index ba97ea0c0a..0000000000 --- a/broadcastradio/1.2/ITuner.hal +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2017 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.broadcastradio@1.2; - -import @1.1::ITuner; - -interface ITuner extends @1.1::ITuner { - /** - * Generic method for setting vendor-specific parameter values. - * The framework does not interpret the parameters, they are passed - * in an opaque manner between a vendor application and HAL. - * - * Framework does not make any assumptions on the keys or values, other than - * ones stated in VendorKeyValue documentation (a requirement of key - * prefixes). - * - * For each pair in the result vector, the key must be one of the keys - * contained in the input (possibly with wildcards expanded), and the value - * must be a vendor-specific result status (i.e. the string "OK" or an error - * code). The implementation may choose to return an empty vector, or only - * return a status for a subset of the provided inputs, at its discretion. - * - * Application and HAL must not use keys with unknown prefix. In particular, - * it must not place a key-value pair in results vector for unknown key from - * parameters vector - instead, an unknown key should simply be ignored. - * In other words, results vector may contain a subset of parameter keys - * (however, the framework doesn't enforce a strict subset - the only - * formal requirement is vendor domain prefix for keys). - * - * @param parameters Vendor-specific key-value pairs. - * @return results Operation completion status for parameters being set. - */ - setParameters(vec parameters) - generates (vec results); - - /** - * Generic method for retrieving vendor-specific parameter values. - * The framework does not interpret the parameters, they are passed - * in an opaque manner between a vendor application and HAL. - * - * Framework does not cache set/get requests, so it's allowed for - * getParameter to return a different value than previous setParameter call. - * - * The syntax and semantics of keys are up to the vendor (as long as prefix - * rules are obeyed). For instance, vendors may include some form of - * wildcard support. In such case, result vector may be of different size - * than requested keys vector. However, wildcards are not recognized by - * framework and they are passed as-is to the HAL implementation. - * - * Unknown keys must be ignored and not placed into results vector. - * - * @param keys Parameter keys to fetch. - * @return parameters Vendor-specific key-value pairs. - */ - getParameters(vec keys) generates (vec parameters); -}; diff --git a/broadcastradio/1.2/ITunerCallback.hal b/broadcastradio/1.2/ITunerCallback.hal deleted file mode 100644 index 4e3d0a5689..0000000000 --- a/broadcastradio/1.2/ITunerCallback.hal +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2017 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.broadcastradio@1.2; - -import @1.1::ITunerCallback; - -interface ITunerCallback extends @1.1::ITunerCallback { - /** - * Generic callback for passing updates to vendor-specific parameter values. - * The framework does not interpret the parameters, they are passed - * in an opaque manner between a vendor application and HAL. - * - * It's up to the HAL implementation if and how to implement this callback, - * as long as it obeys the prefix rule. In particular, only selected keys - * may be notified this way. However, setParameters must not trigger - * this callback, while an internal event can change parameters - * asynchronously. - * - * @param parameters Vendor-specific key-value pairs. - */ - oneway parametersUpdated(vec parameters); -}; diff --git a/broadcastradio/1.2/types.hal b/broadcastradio/1.2/types.hal deleted file mode 100644 index 7301e13ccf..0000000000 --- a/broadcastradio/1.2/types.hal +++ /dev/null @@ -1,50 +0,0 @@ -/** - * Copyright 2017 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.broadcastradio@1.2; - -import @1.1::IdentifierType; -import @1.1::Result; -import @1.1::VendorKeyValue; - -typedef @1.1::Result Result; -typedef @1.1::VendorKeyValue VendorKeyValue; - -enum IdentifierType : @1.1::IdentifierType { - /** - * 28bit compound primary identifier for DAB. - * - * Consists of (from the LSB): - * - 16bit: SId; - * - 8bit: ECC code; - * - 4bit: SCIdS (optional). - * - * SCIdS (Service Component Identifier within the Service) value - * of 0 represents the main service, while 1 and above represents - * secondary services. - * - * The remaining bits should be set to zeros when writing on the chip side - * and ignored when read. - * - * This identifier deprecates DAB_SIDECC and makes new primary identifier - * for DAB. If the hal implementation detects 1.2 client (by casting - * V1_0::ITunerCallback to V1_2::ITunerCallback), it must use DAB_SID_EXT - * as a primary identifier for DAB program type. If the hal client detects - * either 1.1 or 1.2 HAL, it must convert those identifiers to the - * correct version. - */ - DAB_SID_EXT = SXM_CHANNEL + 1, -};