From 9cc471ce76539ea24dc258d08778fa88e3eeaaae Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Tue, 23 Jan 2018 12:33:56 -0800
Subject: Fix wrong use if "!UserHandle.isApp()"

Turned out !UserHandle.isApp() doesn't mean "is system" because of isolated UIDs.

Bug: 72174012
Test: atest $ANDROID_BUILD_TOP/frameworks/base/services/tests/servicestests/src/com/android/server/ForceAppStandbyTrackerTest.java
Change-Id: Ibf6175d550ecc74677877c74db2473bf3f30132d
---
 core/java/android/os/Process.java | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'core/java/android/os/Process.java')

diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
index 7654e9b6ee22..a932d01946e3 100644
--- a/core/java/android/os/Process.java
+++ b/core/java/android/os/Process.java
@@ -573,6 +573,14 @@ public class Process {
         return UserHandle.of(UserHandle.getUserId(myUid()));
     }
 
+    /**
+     * Returns whether the given uid belongs to a system core component or not.
+     * @hide
+     */
+    public static boolean isCoreUid(int uid) {
+        return UserHandle.isCore(uid);
+    }
+
     /**
      * Returns whether the given uid belongs to an application.
      * @param uid A kernel uid.
-- 
cgit v1.2.3