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

Commit d51bd877 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "Const modifiers" am: 4efd353d 

am: 92d8772c

Change-Id: I453dbfb45e3f70586e77cb28207c164fe9cb72fa
parents 6b3df648 92d8772c

otafault/ota_io.cpp

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int __ota_fclose(FILE* fh) { 
    return fclose(fh);

}



void OtaFcloser::operator()(FILE* f) {

void OtaFcloser::operator()(FILE* f) const {

    __ota_fclose(f);

};

otafault/ota_io.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ using unique_fd = android::base::unique_fd_impl<OtaCloser>; 
int ota_close(unique_fd& fd);



struct OtaFcloser {

  void operator()(FILE*);

  void operator()(FILE*) const;

};



using unique_file = std::unique_ptr<FILE, OtaFcloser>;

screen_ui.cpp

+3 −3
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ GRSurface* ScreenRecoveryUI::GetCurrentText() { 
    }

}



int ScreenRecoveryUI::PixelsFromDp(int dp) {

int ScreenRecoveryUI::PixelsFromDp(int dp) const {

    return dp * density_;

}
@@ -256,12 +256,12 @@ void ScreenRecoveryUI::DrawHorizontalRule(int* y) { 
    *y += 4;

}



void ScreenRecoveryUI::DrawTextLine(int x, int* y, const char* line, bool bold) {

void ScreenRecoveryUI::DrawTextLine(int x, int* y, const char* line, bool bold) const {

    gr_text(gr_sys_font(), x, *y, line, bold);

    *y += char_height_ + 4;

}



void ScreenRecoveryUI::DrawTextLines(int x, int* y, const char* const* lines) {

void ScreenRecoveryUI::DrawTextLines(int x, int* y, const char* const* lines) const {

    for (size_t i = 0; lines != nullptr && lines[i] != nullptr; ++i) {

        DrawTextLine(x, y, lines[i], false);

    }

screen_ui.h

+3 −3
Original line number Diff line number Diff line
@@ -160,14 +160,14 @@ class ScreenRecoveryUI : public RecoveryUI { 
    void LoadBitmap(const char* filename, GRSurface** surface);

    void LoadLocalizedBitmap(const char* filename, GRSurface** surface);



    int PixelsFromDp(int dp);

    int PixelsFromDp(int dp) const;

    virtual int GetAnimationBaseline();

    virtual int GetProgressBaseline();

    virtual int GetTextBaseline();



    void DrawHorizontalRule(int* y);

    void DrawTextLine(int x, int* y, const char* line, bool bold);

    void DrawTextLines(int x, int* y, const char* const* lines);

    void DrawTextLine(int x, int* y, const char* line, bool bold) const;

    void DrawTextLines(int x, int* y, const char* const* lines) const;

};



#endif  // RECOVERY_UI_H

verifier.cpp

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ std::unique_ptr<RSA, RSADeleter> parse_rsa_key(FILE* file, uint32_t exponent) { 
}



struct BNDeleter {

  void operator()(BIGNUM* bn) {

  void operator()(BIGNUM* bn) const {

    BN_free(bn);

  }

};