diff options
| author | Tri Vo <trong@google.com> | 2021-08-11 16:17:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-11 16:17:11 +0000 |
| commit | 43c4eca972519bc441b563086da504d0ac40ec3e (patch) | |
| tree | e6c8611351d0924362d0c79f288e347a20fc21a4 | |
| parent | f0181d58609e30f54abbd373d9e26b39a41badb5 (diff) | |
| parent | c87ea84d206a16e7ab7b5593c124e0cced288c31 (diff) | |
| download | core-43c4eca972519bc441b563086da504d0ac40ec3e.tar.gz | |
Merge "trusty: storage: Allow starting without /data mounted" into sc-dev am: c87ea84d20
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15479651
Change-Id: I7a126a9f3d6f35b49542b291599467a986c8c2a4
| -rw-r--r-- | trusty/storage/proxy/storage.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/trusty/storage/proxy/storage.c b/trusty/storage/proxy/storage.c index 5b83e2141..2fde30f84 100644 --- a/trusty/storage/proxy/storage.c +++ b/trusty/storage/proxy/storage.c @@ -477,7 +477,6 @@ int storage_init(const char *dirname) if (ssdir_fd < 0) { ALOGE("failed to open ss root dir \"%s\": %s\n", dirname, strerror(errno)); - return -1; } ssdir_name = dirname; return 0; |