diff options
| author | 2024-05-17 17:52:26 +0000 | |
|---|---|---|
| committer | 2024-05-17 17:52:26 +0000 | |
| commit | 149f436f5d87f63374c6ac5641f65489e9afbe4c (patch) | |
| tree | eb92f02fc455a1f6a78615ec5ad28fd3998a9ea6 | |
| parent | ebfa026b1383d9d7b03a53753fb49e63ce4b4a34 (diff) | |
| parent | 3ec82a163f63b82c602e498b54f57c8fa53fe769 (diff) | |
Merge "Fix incorrect gid config leads to process/system cannot start." into main am: b19525912f am: 3ec82a163f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3002669
Change-Id: I669ee1aa362c43155834b04073573cc040350c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/SystemConfig.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/SystemConfig.java b/services/core/java/com/android/server/SystemConfig.java index a508ebfdb950..8c1bb3b0cb71 100644 --- a/services/core/java/com/android/server/SystemConfig.java +++ b/services/core/java/com/android/server/SystemConfig.java @@ -1783,7 +1783,13 @@ public class SystemConfig { String gidStr = parser.getAttributeValue(null, "gid"); if (gidStr != null) { int gid = Process.getGidForName(gidStr); - perm.gids = appendInt(perm.gids, gid); + if (gid != -1) { + perm.gids = appendInt(perm.gids, gid); + } else { + Slog.w(TAG, "<group> with unknown gid \"" + + gidStr + " for permission " + name + " in " + + parser.getPositionDescription()); + } } else { Slog.w(TAG, "<group> without gid at " + parser.getPositionDescription()); |