commit 07238e5a3f3cd09af7f782929b8cda1f861b2402
author Zoey Chen <zoeychen@google.com> Sat Feb 17 12:00:07 2024 +0000
committer Zoey Chen <zoeychen@google.com> Sat Feb 17 12:01:59 2024 +0000
tree 41b70fba47f737f5f6bd481937a77cd82648d71c
parent bddfb8036b41fb7c0f26d1584e728b418c1e1d57

[ToA] Add the root uid for CTS

Bug: 324916738
Test: atest GrammaticalInflectionManagerTest
Change-Id: I4843fbb349bc3efe5c8f1428a16780803a859c2d

services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionService.java

diff --git a/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionService.java b/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionService.java
index d01f54f..258e97d 100644
--- a/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionService.java
+++ b/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionService.java
@@ -329,8 +329,9 @@
 
     private void checkCallerIsSystem() {
         int callingUid = Binder.getCallingUid();
-        if (callingUid != Process.SYSTEM_UID && callingUid != Process.SHELL_UID) {
-            throw new SecurityException("Caller is not system and shell.");
+        if (callingUid != Process.SYSTEM_UID && callingUid != Process.SHELL_UID
+                && callingUid != Process.ROOT_UID) {
+            throw new SecurityException("Caller is not system, shell and root.");
         }
     }