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

Commit 5bf1372e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unused ADisplay_getDensity"

parents 9fed2ba5 9b416b08

libs/nativedisplay/ADisplay.cpp

+2 −13
Original line number Diff line number Diff line
@@ -49,11 +49,6 @@ struct DisplayConfigImpl { 


    int32_t height{0};



    /**

     * The display density.

     */

    float density{0};



    /**

     * The refresh rate of the display configuration, in frames per second.

     */
@@ -168,8 +163,8 @@ int ADisplay_acquirePhysicalDisplays(ADisplay*** outDisplays) { 
            const ui::DisplayMode& mode = modes[j];

            modesPerDisplay[i].emplace_back(

                    DisplayConfigImpl{static_cast<size_t>(mode.id), mode.resolution.getWidth(),

                                      mode.resolution.getHeight(), staticInfo.density,

                                      mode.refreshRate, mode.sfVsyncOffset, mode.appVsyncOffset});

                                      mode.resolution.getHeight(), mode.refreshRate,

                                      mode.sfVsyncOffset, mode.appVsyncOffset});

        }

    }
@@ -283,12 +278,6 @@ int ADisplay_getCurrentConfig(ADisplay* display, ADisplayConfig** outConfig) { 
    return NAME_NOT_FOUND;

}



float ADisplayConfig_getDensity(ADisplayConfig* config) {

    CHECK_NOT_NULL(config);



    return reinterpret_cast<DisplayConfigImpl*>(config)->density;

}



int32_t ADisplayConfig_getWidth(ADisplayConfig* config) {

    CHECK_NOT_NULL(config);

libs/nativedisplay/include/apex/display.h

+0 −5
Original line number Diff line number Diff line
@@ -106,11 +106,6 @@ void ADisplay_getPreferredWideColorFormat(ADisplay* display, ADataSpace* outData 
 */

int ADisplay_getCurrentConfig(ADisplay* display, ADisplayConfig** outConfig);



/**

 * Queries the density for a given display configuration.

 */

float ADisplayConfig_getDensity(ADisplayConfig* config);



/**

 * Queries the width in pixels for a given display configuration.

 */

libs/nativedisplay/libnativedisplay.map.txt

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ LIBNATIVEDISPLAY_PLATFORM { 
      android::ADisplay_getDisplayType*;

      android::ADisplay_getPreferredWideColorFormat*;

      android::ADisplay_getCurrentConfig*;

      android::ADisplayConfig_getDensity*;

      android::ADisplayConfig_getWidth*;

      android::ADisplayConfig_getHeight*;

      android::ADisplayConfig_getFps*;