commit b19525912f9d4f92be4062d2ab7f3ed3b1abf776
author Song Chun Fan <schfan@google.com> Fri May 17 16:58:30 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 17 16:58:30 2024 +0000
tree ba2a3de1752958faf4b0fd6f3385b4d4a4570957
parent c788401eed8f181cb643c6df0933a86f6e6bbd2a
parent a7d6c67474741bcf1c7dda5cc80a06210e549c7b

Merge "Fix incorrect gid config leads to process/system cannot start." into main

services/core/java/com/android/server/SystemConfig.java

diff --git a/services/core/java/com/android/server/SystemConfig.java b/services/core/java/com/android/server/SystemConfig.java
index 79620cf..1c1190f 100644
--- a/services/core/java/com/android/server/SystemConfig.java
+++ b/services/core/java/com/android/server/SystemConfig.java
@@ -1638,7 +1638,13 @@
                 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());