Merge "Add UserHandle.getAppId to SystemApi"

2 files changed, 2 insertions, 0 deletions

diff --git a/api/system-current.txt b/api/system-current.txt
index 3bc22e66aa77..64a0881b41b3 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -4305,6 +4305,7 @@ package android.os {
   }
 
   public final class UserHandle implements android.os.Parcelable {
+    method public static int getAppId(int);
     method public int getIdentifier();
     method @Deprecated public boolean isOwner();
     method public boolean isSystem();
diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java
index 648c022d8673..de41ce2e08c5 100644
--- a/core/java/android/os/UserHandle.java
+++ b/core/java/android/os/UserHandle.java
@@ -226,6 +226,7 @@ public final class UserHandle implements Parcelable {
      * @hide
      */
     @TestApi
+    @SystemApi
     public static @AppIdInt int getAppId(int uid) {
         return uid % PER_USER_RANGE;
     }