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

Commit 8c34c817 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Move broadcast radio 1.2 default implementation back to 1.1. 

Bug: 62945293
Test: VTS

Change-Id: I95d68ea61f5b50c5b510212b0941bddad1158f97
parent e3d0fd34

broadcastradio/1.2/default/Android.bp→broadcastradio/1.1/default/Android.bp

+2 −3
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
//



cc_binary {

    name: "android.hardware.broadcastradio@1.2-service",

    init_rc: ["android.hardware.broadcastradio@1.2-service.rc"],

    name: "android.hardware.broadcastradio@1.1-service",

    init_rc: ["android.hardware.broadcastradio@1.1-service.rc"],

    vendor: true,

    relative_install_path: "hw",

    cflags: [
@@ -39,7 +39,6 @@ cc_binary { 
    shared_libs: [

        "android.hardware.broadcastradio@1.0",

        "android.hardware.broadcastradio@1.1",

        "android.hardware.broadcastradio@1.2",

        "libbase",

        "libhidlbase",

        "libhidltransport",

broadcastradio/1.2/default/BroadcastRadio.cpp→broadcastradio/1.1/default/BroadcastRadio.cpp

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
namespace android {

namespace hardware {

namespace broadcastradio {

namespace V1_2 {

namespace V1_1 {

namespace implementation {



using V1_0::Band;
@@ -190,7 +190,7 @@ Return<void> BroadcastRadio::getImage(int32_t id, getImage_cb _hidl_cb) { 
}



}  // namespace implementation

}  // namespace V1_2

}  // namespace V1_1

}  // namespace broadcastradio

}  // namespace hardware

}  // namespace android

broadcastradio/1.2/default/BroadcastRadio.h→broadcastradio/1.1/default/BroadcastRadio.h

+8 −8
Original line number Diff line number Diff line
@@ -13,18 +13,18 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_2_BROADCASTRADIO_H

#define ANDROID_HARDWARE_BROADCASTRADIO_V1_2_BROADCASTRADIO_H

#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_1_BROADCASTRADIO_H

#define ANDROID_HARDWARE_BROADCASTRADIO_V1_1_BROADCASTRADIO_H



#include "Tuner.h"



#include <android/hardware/broadcastradio/1.1/IBroadcastRadio.h>

#include <android/hardware/broadcastradio/1.2/types.h>

#include <android/hardware/broadcastradio/1.1/types.h>



namespace android {

namespace hardware {

namespace broadcastradio {

namespace V1_2 {

namespace V1_1 {

namespace implementation {



struct AmFmBandConfig {
@@ -73,9 +73,9 @@ struct BroadcastRadio : public V1_1::IBroadcastRadio { 
};



}  // namespace implementation

}  // namespace V1_2

}  // namespace V1_1

}  // namespace broadcastradio

}  // namespace hardware

}  // namespace android



#endif  // ANDROID_HARDWARE_BROADCASTRADIO_V1_2_BROADCASTRADIO_H
 
#endif  // ANDROID_HARDWARE_BROADCASTRADIO_V1_1_BROADCASTRADIO_H

broadcastradio/1.2/default/BroadcastRadioFactory.cpp→broadcastradio/1.1/default/BroadcastRadioFactory.cpp

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
namespace android {

namespace hardware {

namespace broadcastradio {

namespace V1_2 {

namespace V1_1 {

namespace implementation {



using V1_0::Class;
@@ -57,7 +57,7 @@ Return<void> BroadcastRadioFactory::connectModule(Class classId, connectModule_c 
}



}  // namespace implementation

}  // namespace V1_2

}  // namespace V1_1

}  // namespace broadcastradio

}  // namespace hardware

}  // namespace android

broadcastradio/1.2/default/BroadcastRadioFactory.h→broadcastradio/1.1/default/BroadcastRadioFactory.h

+7 −7
Original line number Diff line number Diff line
@@ -13,17 +13,17 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_2_BROADCASTRADIOFACTORY_H

#define ANDROID_HARDWARE_BROADCASTRADIO_V1_2_BROADCASTRADIOFACTORY_H

#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_1_BROADCASTRADIOFACTORY_H

#define ANDROID_HARDWARE_BROADCASTRADIO_V1_1_BROADCASTRADIOFACTORY_H



#include <android/hardware/broadcastradio/1.1/IBroadcastRadio.h>

#include <android/hardware/broadcastradio/1.2/IBroadcastRadioFactory.h>

#include <android/hardware/broadcastradio/1.2/types.h>

#include <android/hardware/broadcastradio/1.1/IBroadcastRadioFactory.h>

#include <android/hardware/broadcastradio/1.1/types.h>



namespace android {

namespace hardware {

namespace broadcastradio {

namespace V1_2 {

namespace V1_1 {

namespace implementation {



struct BroadcastRadioFactory : public IBroadcastRadioFactory {
@@ -37,9 +37,9 @@ struct BroadcastRadioFactory : public IBroadcastRadioFactory { 
};



}  // namespace implementation

}  // namespace V1_2

}  // namespace V1_1

}  // namespace broadcastradio

}  // namespace hardware

}  // namespace android



#endif  // ANDROID_HARDWARE_BROADCASTRADIO_V1_2_BROADCASTRADIOFACTORY_H
 
#endif  // ANDROID_HARDWARE_BROADCASTRADIO_V1_1_BROADCASTRADIOFACTORY_H