commit 9e73f1dba6d234c8e860de9cc681dfec7d964356
author Zoey Chen <zoeychen@google.com> Sat Feb 17 14:46:55 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 17 14:46:55 2024 +0000
tree 76a7f0a1c975925998a5a5c36b3795ecb2767df7
parent b40eb0e0e0ec24de116e273904c4a907eb78ff2b
parent 07238e5a3f3cd09af7f782929b8cda1f861b2402

Merge "[ToA] Add the root uid for CTS" into main

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.");
         }
     }