diff options
| author | 2022-02-09 15:29:32 -0800 | |
|---|---|---|
| committer | 2022-02-09 15:30:51 -0800 | |
| commit | 623cf543a8ecb9441cf2f4933767bcde2a959b43 (patch) | |
| tree | 72b3600ec5f69f74b8784aacd42577f70d6da64c | |
| parent | a31dc6da2afbe5d4b100af1ea70c25fea1cbaa32 (diff) | |
Fix cert-dcl16-c warnings
Bug: 120614316
Test: make tidy-frameworks-base_subset
Change-Id: Ie71c06e02fcb9a2f90508c37d926a79e0b591c5a
| -rw-r--r-- | libs/androidfw/tests/BackupHelpers_test.cpp | 2 | ||||
| -rw-r--r-- | services/core/jni/BroadcastRadio/types.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libs/androidfw/tests/BackupHelpers_test.cpp b/libs/androidfw/tests/BackupHelpers_test.cpp index 86b7fb361228..c2fcb6990f90 100644 --- a/libs/androidfw/tests/BackupHelpers_test.cpp +++ b/libs/androidfw/tests/BackupHelpers_test.cpp @@ -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); diff --git a/services/core/jni/BroadcastRadio/types.h b/services/core/jni/BroadcastRadio/types.h index 910bb7c0a4d1..4d286bf05650 100644 --- a/services/core/jni/BroadcastRadio/types.h +++ b/services/core/jni/BroadcastRadio/types.h @@ -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. |