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

Commit 1395874b authored by Aurimas Liutikas's avatar Aurimas Liutikas
Browse files

Fix warnigns in frameworks/av/services/radio. 

- Fixes a number of "suggest braces around initialization of subobject"
warnings. [-Wmissing-braces]
- Fixes assignment operation.

Bug: 27151636
Change-Id: Id468ff7be4914c04224fd4430ccd128e7f3a89c8
parent 262c39e3

services/radio/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ LOCAL_SHARED_LIBRARIES:= \ 
    libradio \

    libradio_metadata



LOCAL_CFLAGS += -Wall -Wextra -Werror



LOCAL_MODULE:= libradioservice



include $(BUILD_SHARED_LIBRARY)

services/radio/RadioRegions.h

+48 −30
Original line number Diff line number Diff line
@@ -66,12 +66,15 @@ const radio_band_config_t sKnownRegionConfigs[] = { 
            RADIO_BAND_UPPER_FM_ITU1,

            1,

            {RADIO_BAND_SPACING_FM_ITU1},

            {

                {

                RADIO_DEEMPHASIS_50,

                true,

                RADIO_RDS_WORLD,

                true,

                true,

                true,

                }

            }

        }

    },
@@ -84,12 +87,15 @@ const radio_band_config_t sKnownRegionConfigs[] = { 
            RADIO_BAND_UPPER_FM_ITU2,

            1,

            {RADIO_BAND_SPACING_FM_ITU2},

            {

                {

                RADIO_DEEMPHASIS_75,

                true,

                RADIO_RDS_US,

                true,

                true,

                true,

                }

            }

        }

    },
@@ -102,12 +108,15 @@ const radio_band_config_t sKnownRegionConfigs[] = { 
            RADIO_BAND_UPPER_FM_JAPAN,

            1,

            {RADIO_BAND_SPACING_FM_JAPAN},

            {

                {

                RADIO_DEEMPHASIS_50,

                true,

                RADIO_RDS_WORLD,

                true,

                true,

                true,

                }

            }

        }

    },
@@ -120,12 +129,15 @@ const radio_band_config_t sKnownRegionConfigs[] = { 
            RADIO_BAND_UPPER_FM_ITU1,

            1,

            {RADIO_BAND_SPACING_FM_ITU1},

            {

                {

                RADIO_DEEMPHASIS_75,

                true,

                RADIO_RDS_WORLD,

                true,

                true,

                true,

                }

            }

        }

    },
@@ -138,12 +150,15 @@ const radio_band_config_t sKnownRegionConfigs[] = { 
            RADIO_BAND_UPPER_FM_OIRT,

            1,

            {RADIO_BAND_SPACING_FM_OIRT},

            {

                {

                RADIO_DEEMPHASIS_50,

                true,

                RADIO_RDS_WORLD,

                true,

                true,

                true,

                }

            }

        }

    },
@@ -156,12 +171,15 @@ const radio_band_config_t sKnownRegionConfigs[] = { 
            RADIO_BAND_UPPER_FM_ITU2,

            1,

            {RADIO_BAND_SPACING_FM_ITU2},

            {

                {

                RADIO_DEEMPHASIS_75,

                true,

                RADIO_RDS_US,

                true,

                true,

                true,

                }

            }

        }

    },

services/radio/RadioService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -735,7 +735,7 @@ status_t RadioService::ModuleClient::setConfiguration(const struct radio_band_co 
        }

    } else {

        mConfig = *config;

        status == INVALID_OPERATION;

        status = INVALID_OPERATION;

    }



    return status;