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

Commit 62bdac3e authored by Yi-yo Chiang's avatar Yi-yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "set-verity-state: Start a threadpool to service waitForService() CB"... 

Merge "set-verity-state: Start a threadpool to service waitForService() CB" am: e761510d am: f3725dcd am: c80aca52 am: c60650ae am: 45f6f14d

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



Change-Id: Icadf9163e2454bedede4b7bfb9299d034756a918
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d360d093 45f6f14d

set-verity-state/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -9,9 +9,11 @@ cc_binary { 
    srcs: ["set-verity-state.cpp"],

    shared_libs: [

        "libbase",

        "libbinder",

        "libcrypto",

        "libcrypto_utils",

        "libfs_mgr_binder",

        "libutils",

    ],

    static_libs: [

        "libavb_user",

set-verity-state/set-verity-state.cpp

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <android-base/file.h>

#include <android-base/logging.h>

#include <android-base/properties.h>

#include <binder/ProcessState.h>

#include <fs_mgr_overlayfs.h>

#include <libavb_user/libavb_user.h>
@@ -153,6 +154,9 @@ int main(int argc, char* argv[]) { 
    return 1;

  }



  // Start a threadpool to service waitForService() callbacks as

  // fs_mgr_overlayfs_* might call waitForService() to get the image service.

  android::ProcessState::self()->startThreadPool();

  bool any_changed = set_avb_verity_enabled_state(ops.get(), enable);

  any_changed |= overlayfs_setup(enable);