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

Commit d78c0842 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix cert-dcl16-c warnings"

parents 5ec4a129 623cf543

libs/androidfw/tests/BackupHelpers_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ TEST_F(BackupHelpersTest, WriteTarFileWithSizeLessThan2GB) { 
TEST_F(BackupHelpersTest, WriteTarFileWithSizeGreaterThan2GB) {

  TemporaryFile tf;

  // Allocate a 2 GB file.

  off64_t fileSize = 2ll * 1024ll * 1024ll * 1024ll + 512ll;

  off64_t fileSize = 2LL * 1024LL * 1024LL * 1024LL + 512LL;

  ASSERT_EQ(0, posix_fallocate64(tf.fd, 0, fileSize));

  off64_t tarSize = 0;

  int err = write_tarfile(/* packageName */ String8("test-pkg"), /* domain */ String8(""), /* rootpath */ String8(""), /* filePath */ String8(tf.path), /* outSize */ &tarSize, /* writer */ NULL);

services/core/jni/BroadcastRadio/types.h

+6 −6
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ namespace BroadcastRadio { 
// Keep in sync with STATUS_* constants from RadioManager.java.

enum class Status : jint {

    OK = 0,

    ERROR = -0x80000000ll,  // Integer.MIN_VALUE

    ERROR = -0x80000000LL,   // Integer.MIN_VALUE

    PERMISSION_DENIED = -1,  // -EPERM

    NO_INIT = -19,           // -ENODEV

    BAD_VALUE = -22,         // -EINVAL