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

Commit 2a84f2e3 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 856dd8a6: Merge change 4952 into donut 

Merge commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60'

* commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60':
  Helper API cleanup.  Allows multiple helpers to function,
parents 924852ec 2e69f210

include/utils/BackupHelpers.h

+3 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ public: 
    status_t WriteEntityHeader(const String8& key, size_t dataSize);

    status_t WriteEntityData(const void* data, size_t size);



    void SetKeyPrefix(const String8& keyPrefix);



private:

    explicit BackupDataWriter();

    status_t write_padding_for(int n);
@@ -79,6 +81,7 @@ private: 
    status_t m_status;

    ssize_t m_pos;

    int m_entityCount;

    String8 m_keyPrefix;

};



/**

libs/utils/BackupData.cpp

+18 −3
Original line number Diff line number Diff line
@@ -99,10 +99,20 @@ BackupDataWriter::WriteEntityHeader(const String8& key, size_t dataSize) 
        return amt;

    }



    String8 k;

    if (m_keyPrefix.length() > 0) {

        k = m_keyPrefix;

        k += ":";

        k += key;

    } else {

        k = key;

    }

    LOGD("m_keyPrefix=%s key=%s k=%s", m_keyPrefix.string(), key.string(), k.string());



    entity_header_v1 header;

    ssize_t keyLen;



    keyLen = key.length();

    keyLen = k.length();



    header.type = tolel(BACKUP_HEADER_ENTITY_V1);

    header.keyLen = tolel(keyLen);
@@ -115,7 +125,7 @@ BackupDataWriter::WriteEntityHeader(const String8& key, size_t dataSize) 
    }

    m_pos += amt;



    amt = write(m_fd, key.string(), keyLen+1);

    amt = write(m_fd, k.string(), keyLen+1);

    if (amt != keyLen+1) {

        m_status = errno;

        return m_status;
@@ -148,6 +158,11 @@ BackupDataWriter::WriteEntityData(const void* data, size_t size) 
    return NO_ERROR;

}



void

BackupDataWriter::SetKeyPrefix(const String8& keyPrefix)

{

    m_keyPrefix = keyPrefix;

}





BackupDataReader::BackupDataReader(int fd)
@@ -298,7 +313,7 @@ BackupDataReader::ReadEntityData(void* data, size_t size) 
    if (remaining <= 0) {

        return 0;

    }

    if (size > remaining) {

    if (((int)size) > remaining) {

        size = remaining;

    }

    //LOGD("   reading %d bytes", size);