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

Commit da6d48ec authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Cleanup for #inclusivefixit." am: ab89a928 am: bb94bbb0 am: 33bad3ff

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1373456

Change-Id: Ic5c1b736190b409091c611b2dce3bad4f9668fa9
parents e5c42a3c 33bad3ff
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ static void tune_metadata_csum(const std::string& blk_device, const FstabEntry&

    LINFO << "Enabling ext4 metadata_csum on " << blk_device;

    // requires to give last_fsck_time to current to avoid insane time.
    // Must give `-T now` to prevent last_fsck_time from growing too large,
    // otherwise, tune2fs won't enable metadata_csum.
    const char* tune2fs_args[] = {TUNE2FS_BIN, "-O",        "metadata_csum,64bit,extent",
                                  "-T",        "now", blk_device.c_str()};
+1 −1
Original line number Diff line number Diff line
@@ -994,7 +994,7 @@ void CreateSerializedPropertyInfo() {
                                      &property_infos)) {
            return;
        }
        // Don't check for failure here, so we always have a sane list of properties.
        // Don't check for failure here, since we don't always have all of these partitions.
        // E.g. In case of recovery, the vendor partition will not have mounted and we
        // still need the system / platform properties to function.
        if (access("/system_ext/etc/selinux/system_ext_property_contexts", R_OK) != -1) {
+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ class InitKillServicesTest : public ::testing::TestWithParam<std::string> {};
TEST_P(InitKillServicesTest, KillCriticalProcesses) {
    ExpectKillingServiceRecovers(GetParam());

    // sanity check init is still responding
    // Ensure that init is still responding
    EXPECT_TRUE(SetProperty("test.death.test", "asdf"));
    EXPECT_EQ(GetProperty("test.death.test", ""), "asdf");
    EXPECT_TRUE(SetProperty("test.death.test", ""));
+1 −2
Original line number Diff line number Diff line
@@ -456,7 +456,6 @@ bool __android_logger_property_get_bool(const char* key, int flag) {
    flag |= BOOL_DEFAULT_FLAG_SVELTE;
  }

  /* Sanity Check */
  if (flag & (BOOL_DEFAULT_FLAG_SVELTE | BOOL_DEFAULT_FLAG_ENG)) {
    flag &= ~BOOL_DEFAULT_FLAG_TRUE_FALSE;
    flag |= BOOL_DEFAULT_TRUE;
+4 −4
Original line number Diff line number Diff line
@@ -616,15 +616,15 @@ int Logcat::Run(int argc, char** argv) {
                if (long_options[option_index].name == wrap_str) {
                    mode |= ANDROID_LOG_WRAP | ANDROID_LOG_NONBLOCK;
                    // ToDo: implement API that supports setting a wrap timeout
                    size_t dummy = ANDROID_LOG_WRAP_DEFAULT_TIMEOUT;
                    if (optarg && (!ParseUint(optarg, &dummy) || dummy < 1)) {
                    size_t timeout = ANDROID_LOG_WRAP_DEFAULT_TIMEOUT;
                    if (optarg && (!ParseUint(optarg, &timeout) || timeout < 1)) {
                        error(EXIT_FAILURE, 0, "%s %s out of range.",
                              long_options[option_index].name, optarg);
                    }
                    if (dummy != ANDROID_LOG_WRAP_DEFAULT_TIMEOUT) {
                    if (timeout != ANDROID_LOG_WRAP_DEFAULT_TIMEOUT) {
                        fprintf(stderr, "WARNING: %s %u seconds, ignoring %zu\n",
                                long_options[option_index].name, ANDROID_LOG_WRAP_DEFAULT_TIMEOUT,
                                dummy);
                                timeout);
                    }
                    break;
                }
Loading