drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix cert-dcl16-c warnings" am: d78c0842df am: a4e7dfab4c am: 34fe73e15f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1977907

Change-Id: Ia481193cdbd62c60d572db1c087597b439348ebd
This commit is contained in:
Treehugger Robot 2022-02-14 17:35:45 +00:00 committed by Automerger Merge Worker
commit a2f9e47c87
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/androidfw/tests/BackupHelpers_test.cpp
View File

@ -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);

12
services/core/jni/BroadcastRadio/types.h
View File

@ -30,13 +30,13 @@ 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
DEAD_OBJECT = -32, // -EPIPE
INVALID_OPERATION = -38, // -ENOSYS
TIMED_OUT = -110, // -ETIMEDOUT
NO_INIT = -19, // -ENODEV
BAD_VALUE = -22, // -EINVAL
DEAD_OBJECT = -32, // -EPIPE
INVALID_OPERATION = -38, // -ENOSYS
TIMED_OUT = -110, // -ETIMEDOUT
};
// Keep in sync with REGION_* constants from RadioManager.java.