diff options
| author | Alessio Balsini <balsini@google.com> | 2020-01-21 19:15:41 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2020-01-21 19:15:41 -0800 |
| commit | 008365f8352f7541e600e8e8442214dce192d49f (patch) | |
| tree | acc79a28726ba84ec873d915d11e5061fb355440 | |
| parent | a7d411f7accb5cb44a3f0cad088a7c0968eb7b27 (diff) | |
| parent | bb774d0996cbea04367ac6376691eedcb7b6a4ed (diff) | |
| download | gsid-008365f8352f7541e600e8e8442214dce192d49f.tar.gz | |
Use default path if DSU install dir file does not exit
am: bb774d0996
Change-Id: I7ec39911e5295600ac260902fddb2e6e21fc57b2
| -rw-r--r-- | gsi_service.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gsi_service.cpp b/gsi_service.cpp index 8a77f4f..9b74502 100644 --- a/gsi_service.cpp +++ b/gsi_service.cpp @@ -640,7 +640,9 @@ binder::Status GsiService::openImageService(const std::string& prefix, auto in_data_dir = kImageDataPrefix + prefix; auto install_dir_file = DsuInstallDirFile(GetDsuSlot(prefix)); - if (android::base::ReadFileToString(install_dir_file, &in_data_dir)) { + std::string in_data_dir_tmp; + if (android::base::ReadFileToString(install_dir_file, &in_data_dir_tmp)) { + in_data_dir = in_data_dir_tmp; LOG(INFO) << "load " << install_dir_file << ":" << in_data_dir; } std::string metadata_dir, data_dir; |