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

Commit e3772efd authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 9008 

* changes:
  Only restore the bits for wallpapers that aren't built in.
parents 918dca89 c1d7a6ec

libs/utils/BackupData.cpp

+6 −1
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ BackupDataReader::Status() 
        if ((actual) != (expected)) { \

            if ((actual) == 0) { \

                m_status = EIO; \

                m_done = true; \

            } else { \

                m_status = errno; \

            } \
@@ -222,7 +223,7 @@ BackupDataReader::ReadNextHeader(bool* done, int* type) 


    amt = skip_padding();

    if (amt == EIO) {

        *done = true;

        *done = m_done = true;

        return NO_ERROR;

    }

    else if (amt != NO_ERROR) {
@@ -338,6 +339,10 @@ BackupDataReader::ReadEntityData(void* data, size_t size) 
        m_status = errno;

        return -1;

    }

    if (amt == 0) {

        m_status = EIO;

        m_done = true;

    }

    m_pos += amt;

    return amt;

}