| commit | cc4ebd84429a0c162d1f5ad6239b1732e2b75761 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Wed Mar 08 20:56:22 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 08 20:56:22 2023 +0000 |
| tree | 980d5a9de7326b521bb33935a7c893df70723ce2 | |
| parent | 0e161700aab01b69d596badea0d1dcae0ea0358c [diff] | |
| parent | 9089ec6b0ba2a71ae1b3272f487728e6e8b58abb [diff] |
Merge "Avoid odd behavior when clearing nonexistent SID" am: 9089ec6b0b Original change: https://android-review.googlesource.com/c/platform/system/core/+/2470860 Change-Id: I760afb05eb7a0b802d4dc053371ebdfe18e3c723 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp index 76fcd55..eb43a33 100644 --- a/gatekeeperd/gatekeeperd.cpp +++ b/gatekeeperd/gatekeeperd.cpp
@@ -151,7 +151,7 @@ void clear_sid(uint32_t userId) { char filename[21]; snprintf(filename, sizeof(filename), "%u", userId); - if (remove(filename) < 0) { + if (remove(filename) < 0 && errno != ENOENT) { ALOGE("%s: could not remove file [%s], attempting 0 write", __func__, strerror(errno)); store_sid(userId, 0); }