Merge "Fix settings restore even harder"

    private void restoreFileData(String filename, BackupDataInput data) {

        byte[] bytes = new byte[data.getDataSize()];

        if (bytes.length <= 0) return;

        try {

            data.readEntityData(bytes, 0, data.getDataSize());

            restoreFileData(filename, bytes, bytes.length);

        } catch (IOException e) {

            Log.w(TAG, "Unable to read file data for " + filename);

        }

    }

    private void restoreFileData(String filename, byte[] bytes, int size) {