From cc8b57a2547240d93135a84e9d0f7ecbd971b2b9 Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Wed, 22 Feb 2023 16:17:10 -0800
Subject: [PATCH] Exposed UserManager.getDisplayIdAssignedToUser as @TestApi

Test: m update-api # not used  yet, but will on CTS soon
Bug: 269805096

Change-Id: Id38438ae264989cda08c3fe97c602928bb3f11a5
---
 core/api/test-current.txt             | 1 +
 core/java/android/os/UserManager.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index def3fa93ce3c1..8d55afbebe67e 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -2163,6 +2163,7 @@ package android.os {
     method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createRestrictedProfile(@Nullable String);
     method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createUser(@Nullable String, @NonNull String, int);
     method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.os.UserHandle getBootUser();
+    method public int getDisplayIdAssignedToUser();
     method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public java.util.Set<java.lang.String> getPreInstallableSystemPackages(@NonNull String);
     method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS, android.Manifest.permission.QUERY_USERS}) public String getUserType();
     method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public java.util.List<android.content.pm.UserInfo> getUsers(boolean, boolean, boolean);
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index bbf7f810b3c00..bb35ca18f9881 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -3056,6 +3056,7 @@ public class UserManager {
      *
      * @hide
      */
+    @TestApi
     public int getDisplayIdAssignedToUser() {
         try {
             return mService.getDisplayIdAssignedToUser();