diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-22 03:42:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-22 03:42:08 +0000 |
| commit | 6f7beb94c6a3d619e35dd26354db41834a50c8ce (patch) | |
| tree | acc79a28726ba84ec873d915d11e5061fb355440 | |
| parent | 359a828f103377adf8d38c865095a3abf30ee82a (diff) | |
| parent | cf333e782434994417253cf2e3af4b56b13b62fc (diff) | |
| download | gsid-6f7beb94c6a3d619e35dd26354db41834a50c8ce.tar.gz | |
Use default path if DSU install dir file does not exit am: bb774d0996 am: 008365f835 am: cf333e7824
Change-Id: I058628d61d94df479200870c60430809289b5301
| -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; |