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

Commit aa07a9c4 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by android-build-merger
Browse files

Merge "Clear out ambiguity in broadcastradio@2.0 comments." into pi-dev 

am: bdf10416

Change-Id: Ibec225fba44cd3af1efdb7a21226fa4b7b8c9c42
parents 5168a640 bdf10416

broadcastradio/2.0/ITunerCallback.hal

+6 −4
Original line number Diff line number Diff line
@@ -17,12 +17,14 @@ package android.hardware.broadcastradio@2.0; 


interface ITunerCallback {

    /**

     * Method called by the HAL when a tuning operation fails

     * Method called by the HAL when a tuning operation fails asynchronously

     * following a step(), scan() or tune() command.

     *

     * @param result OK if tune succeeded;

     *               TIMEOUT in case of time out.

     * @param selector A ProgramSelector structure passed from tune(),

     * This callback is only called when the step(), scan() or tune() command

     * returned OK at first.

     *

     * @param result TIMEOUT in case of time out.

     * @param selector A ProgramSelector structure passed from tune() call;

     *                 empty for step() and scan().

     */

    oneway onTuneFailed(Result result, ProgramSelector selector);

broadcastradio/2.0/types.hal

+7 −1
Original line number Diff line number Diff line
@@ -351,10 +351,16 @@ struct ProgramInfo { 
     * related content (i.e. DAB soft-links). This field is a list of pointers

     * to other programs on the program list.

     *

     * Please note, that these identifiers does not have to exist on the program

     * This is not a list of programs that carry the same content (i.e.

     * DAB hard-links, RDS AF). Switching to programs from this list usually

     * require user action.

     *

     * Please note, that these identifiers do not have to exist on the program

     * list - i.e. DAB tuner may provide information on FM RDS alternatives

     * despite not supporting FM RDS. If the system has multiple tuners, another

     * one may have it on its list.

     *

     * This field is optional (can be empty).

     */

    vec<ProgramIdentifier> relatedContent;

current.txt

+2 −0
Original line number Diff line number Diff line
@@ -250,6 +250,8 @@ f4945e397b5dea41bb64518dfde59be71245d8a125fd1e0acffeb57ac7b08fed android.hardwar 
c8bc853546dd55584611def2a9fa1d99f657e3366c976d2f60fe6b8aa6d2cb87 android.hardware.thermal@1.1::IThermalCallback



# ABI preserving changes to HALs during Android P

eaeb3e4f3237430a7fdc206bffdf844713f5682990b2d49ea24392e15b5d343f android.hardware.broadcastradio@2.0::ITunerCallback

2804120c1f8522ad15feb7695fe5eece527d399b406c671ea99618194118c316 android.hardware.broadcastradio@2.0::types

cf72ff5a52bfa4d08e9e1000cf3ab5952a2d280c7f13cdad5ab7905c08050766 android.hardware.camera.metadata@3.2::types

3902efc42097cba55f0655aa389e052ea70164e99ced1a6d1ef53dafc13f7650 android.hardware.camera.provider@2.4::ICameraProvider

6fa9804a17a8bb7923a56bd10493a5483c20007e4c9026fd04287bee7c945a8c android.hardware.gnss@1.0::IGnssCallback