Use UserHandle.isCore() instead of Process.myUid() < Process.FIRST_APPLICATION_UID to determine if the process is a system process.

This is more robust and will work even if the process is running in a multi-user context.

Change-Id: Idf1d0db3236085702bafb6d48758dd209d06e4f5
Flag: build.RELEASE_PACKAGE_MESSAGEQUEUE_IMPLEMENTATION

1 files changed, 2 insertions, 1 deletions

diff --git a/core/java/android/os/CombinedMessageQueue/MessageQueue.java b/core/java/android/os/CombinedMessageQueue/MessageQueue.java
index 081ae6933544..66f4198ad31c 100644
--- a/core/java/android/os/CombinedMessageQueue/MessageQueue.java
+++ b/core/java/android/os/CombinedMessageQueue/MessageQueue.java
@@ -21,6 +21,7 @@ import android.annotation.NonNull;
 import android.annotation.TestApi;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.os.Process;
+import android.os.UserHandle;
 import android.ravenwood.annotation.RavenwoodKeepWholeClass;
 import android.ravenwood.annotation.RavenwoodRedirect;
 import android.ravenwood.annotation.RavenwoodRedirectionClass;
@@ -112,7 +113,7 @@ public final class MessageQueue {
 
     MessageQueue(boolean quitAllowed) {
         if (!sUseConcurrentInitialized) {
-            sUseConcurrent = Process.myUid() < Process.FIRST_APPLICATION_UID;
+            sUseConcurrent = UserHandle.isCore(Process.myUid());
             sUseConcurrentInitialized = true;
         }
         mQuitAllowed = quitAllowed;