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

Commit ba8bb40b authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "init: only provide control message results for devices launching > Q" am: 0b482ad2

am: 2c9ac318

Change-Id: I7718b4b068463f334963045382f1783e49a280f8
parents b3f286ff 2c9ac318
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static uint32_t SendControlMessage(const std::string& msg, const std::string& na
    // We must release the fd before sending it to init, otherwise there will be a race with init.
    // If init calls close() before Release(), then fdsan will see the wrong tag and abort().
    int fd = -1;
    if (socket != nullptr) {
    if (socket != nullptr && SelinuxGetVendorAndroidVersion() > __ANDROID_API_Q__) {
        fd = socket->Release();
        control_message->set_fd(fd);
    }