From cb8936eae91714bf8390a7e605bef3d09efebe47 Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Mon, 10 Apr 2017 15:37:17 -0700
Subject: [PATCH] Expose UserHandle.getIdentifier() to CTS.

This allows CTS to pass user IDs returned by APIs as UserHandle to various
ADB commands.

Test: Exposing as TestApi only; m -j
Change-Id: Iedba6d83b717baacf9e7cf97f1d32f93c191a5ca
---
 api/test-current.txt                 | 1 +
 core/java/android/os/UserHandle.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/api/test-current.txt b/api/test-current.txt
index 570855fb00435..235b26e728ea5 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -31859,6 +31859,7 @@ package android.os {
     ctor public UserHandle(android.os.Parcel);
     method public int describeContents();
     method public static int getAppId(int);
+    method public int getIdentifier();
     method public static android.os.UserHandle getUserHandleForUid(int);
     method public static android.os.UserHandle readFromParcel(android.os.Parcel);
     method public void writeToParcel(android.os.Parcel, int);
diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java
index 4aec8aea24c55..6a4fef2b67e84 100644
--- a/core/java/android/os/UserHandle.java
+++ b/core/java/android/os/UserHandle.java
@@ -344,6 +344,7 @@ public final class UserHandle implements Parcelable {
      * @hide
      */
     @SystemApi
+    @TestApi
     public @UserIdInt int getIdentifier() {
         return mHandle;
     }