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

Commit 6480d875 authored by Jiakai Zhang's avatar Jiakai Zhang
Browse files

Make snapshotctl also log to logd. 

Since http://r.android.com/2994274, snapshotctl can be run by init.
Therefore, we need it to log to logd for better debuggability.

Bug: 311377497
Test: adb shell setprop sys.snapshotctl.map requested
Test: adb shell setprop sys.snapshotctl.unmap requested
Change-Id: I287ecf77d45fb9e6c44bea36e14d2624029afea5
parent 22ddb0ae

fs_mgr/libsnapshot/snapshotctl.cpp

+7 −4
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ 
using namespace std::chrono_literals;

using namespace std::string_literals;

using namespace android::storage_literals;

using android::base::LogdLogger;

using android::base::StderrLogger;

using android::base::TeeLogger;

using android::fs_mgr::CreateLogicalPartitionParams;

using android::fs_mgr::FindPartition;

using android::fs_mgr::GetPartitionSize;
@@ -461,23 +464,23 @@ bool MapSnapshots::DeleteSnapshots() { 
}



bool DumpCmdHandler(int /*argc*/, char** argv) {

    android::base::InitLogging(argv, &android::base::StderrLogger);

    android::base::InitLogging(argv, TeeLogger(LogdLogger(), &StderrLogger));

    return SnapshotManager::New()->Dump(std::cout);

}



bool MapCmdHandler(int, char** argv) {

    android::base::InitLogging(argv, &android::base::StderrLogger);

    android::base::InitLogging(argv, TeeLogger(LogdLogger(), &StderrLogger));

    using namespace std::chrono_literals;

    return SnapshotManager::New()->MapAllSnapshots(5000ms);

}



bool UnmapCmdHandler(int, char** argv) {

    android::base::InitLogging(argv, &android::base::StderrLogger);

    android::base::InitLogging(argv, TeeLogger(LogdLogger(), &StderrLogger));

    return SnapshotManager::New()->UnmapAllSnapshots();

}



bool MergeCmdHandler(int /*argc*/, char** argv) {

    android::base::InitLogging(argv, &android::base::StderrLogger);

    android::base::InitLogging(argv, TeeLogger(LogdLogger(), &StderrLogger));

    LOG(WARNING) << "Deprecated. Call update_engine_client --merge instead.";

    return false;

}