Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename getDisplayAssignedToUser() to getMainDisplayAssignedToUser()." into udc-dev am: 13f25d786f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22074468

Change-Id: I293af90f51806af5dd7c90fc293bb39a4837c36b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
BK Choi
2023-03-22 22:21:58 +00:00
committed by Automerger Merge Worker
parent 28cd7d9993 13f25d786f
commit e13f00d21f
8 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/test-current.txt
View File

@@ -2251,7 +2251,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 public int getMainDisplayIdAssignedToUser();
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);

2
core/java/android/app/Instrumentation.java
View File

@@ -1151,7 +1151,7 @@ public class Instrumentation {
}
UserManager userManager = mInstrContext.getSystemService(UserManager.class);
int userDisplayId = userManager.getDisplayIdAssignedToUser();
int userDisplayId = userManager.getMainDisplayIdAssignedToUser();
if (VERBOSE) {
Log.v(TAG, "setDisplayIfNeeded(" + event + "): eventDisplayId=" + eventDisplayId
+ ", user=" + mInstrContext.getUser() + ", userDisplayId=" + userDisplayId);

2
core/java/android/os/IUserManager.aidl
View File

@@ -134,7 +134,7 @@ interface IUserManager {
boolean isUserForeground(int userId);
boolean isUserVisible(int userId);
int[] getVisibleUsers();
int getDisplayIdAssignedToUser();
int getMainDisplayIdAssignedToUser();
boolean isUserNameSet(int userId);
boolean hasRestrictedProfiles(int userId);
boolean requestQuietModeEnabled(String callingPackage, boolean enableQuietMode, int userId, in IntentSender target, int flags);

6
core/java/android/os/UserManager.java
View File

@@ -3056,14 +3056,14 @@ public class UserManager {
}
/**
* See {@link com.android.server.pm.UserManagerInternal#getDisplayAssignedToUser(int)}.
* See {@link com.android.server.pm.UserManagerInternal#getMainDisplayAssignedToUser(int)}.
*
* @hide
*/
@TestApi
public int getDisplayIdAssignedToUser() {
public int getMainDisplayIdAssignedToUser() {
try {
return mService.getDisplayIdAssignedToUser();
return mService.getMainDisplayIdAssignedToUser();
} catch (RemoteException re) {
throw re.rethrowFromSystemServer();
}

5
services/core/java/com/android/server/pm/UserManagerInternal.java
View File

@@ -506,15 +506,14 @@ public abstract class UserManagerInternal {
*
* <p>If the user is a profile and is running, it's assigned to its parent display.
*/
// TODO(b/272366483) rename this method to avoid confusion with getDisplaysAssignedTOUser().
public abstract int getDisplayAssignedToUser(@UserIdInt int userId);
public abstract int getMainDisplayAssignedToUser(@UserIdInt int userId);
/**
* Returns all display ids assigned to the user including {@link
* #assignUserToExtraDisplay(int, int) extra displays}, or {@code null} if there is no display
* assigned to the specified user.
*
* <p>Note that this method is different from {@link #getDisplayAssignedToUser(int)}, which
* <p>Note that this method is different from {@link #getMainDisplayAssignedToUser(int)}, which
* returns a main display only.
*/
public abstract @Nullable int[] getDisplaysAssignedToUser(@UserIdInt int userId);

8
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -1996,10 +1996,10 @@ public class UserManagerService extends IUserManager.Stub {
}
@Override
public int getDisplayIdAssignedToUser() {
public int getMainDisplayIdAssignedToUser() {
// Not checking for any permission as it returns info about calling user
int userId = UserHandle.getUserId(Binder.getCallingUid());
int displayId = mUserVisibilityMediator.getDisplayAssignedToUser(userId);
int displayId = mUserVisibilityMediator.getMainDisplayAssignedToUser(userId);
return displayId;
}
@@ -7189,8 +7189,8 @@ public class UserManagerService extends IUserManager.Stub {
}
@Override
public int getDisplayAssignedToUser(@UserIdInt int userId) {
return mUserVisibilityMediator.getDisplayAssignedToUser(userId);
public int getMainDisplayAssignedToUser(@UserIdInt int userId) {
return mUserVisibilityMediator.getMainDisplayAssignedToUser(userId);
}
@Override

10
services/core/java/com/android/server/pm/UserVisibilityMediator.java
View File

@@ -774,9 +774,9 @@ public final class UserVisibilityMediator implements Dumpable {
}
/**
* See {@link UserManagerInternal#getDisplayAssignedToUser(int)}.
* See {@link UserManagerInternal#getMainDisplayAssignedToUser(int)}.
*/
public int getDisplayAssignedToUser(@UserIdInt int userId) {
public int getMainDisplayAssignedToUser(@UserIdInt int userId) {
if (isCurrentUserOrRunningProfileOfCurrentUser(userId)) {
if (mVisibleBackgroundUserOnDefaultDisplayEnabled) {
// When device supports visible bg users on default display, the default display is
@@ -787,8 +787,8 @@ public final class UserVisibilityMediator implements Dumpable {
}
if (userStartedOnDefaultDisplay != USER_NULL) {
if (DBG) {
Slogf.d(TAG, "getDisplayAssignedToUser(%d): returning INVALID_DISPLAY for "
+ "current user user %d was started on DEFAULT_DISPLAY",
Slogf.d(TAG, "getMainDisplayAssignedToUser(%d): returning INVALID_DISPLAY "
+ "for current user user %d was started on DEFAULT_DISPLAY",
userId, userStartedOnDefaultDisplay);
}
return INVALID_DISPLAY;
@@ -809,7 +809,7 @@ public final class UserVisibilityMediator implements Dumpable {
/** See {@link UserManagerInternal#getDisplaysAssignedToUser(int)}. */
@Nullable
public int[] getDisplaysAssignedToUser(@UserIdInt int userId) {
int mainDisplayId = getDisplayAssignedToUser(userId);
int mainDisplayId = getMainDisplayAssignedToUser(userId);
if (mainDisplayId == INVALID_DISPLAY) {
// The user will not have any extra displays if they have no main display.
// Return null if no display is assigned to the user.

8
services/tests/mockingservicestests/src/com/android/server/pm/UserVisibilityMediatorTestCase.java
View File

@@ -674,13 +674,13 @@ abstract class UserVisibilityMediatorTestCase extends ExpectableTestCase {
}
protected void expectDisplayAssignedToUser(@UserIdInt int userId, int displayId) {
expectWithMessage("getDisplayAssignedToUser(%s)", userId)
.that(mMediator.getDisplayAssignedToUser(userId)).isEqualTo(displayId);
expectWithMessage("getMainDisplayAssignedToUser(%s)", userId)
.that(mMediator.getMainDisplayAssignedToUser(userId)).isEqualTo(displayId);
}
protected void expectNoDisplayAssignedToUser(@UserIdInt int userId) {
expectWithMessage("getDisplayAssignedToUser(%s)", userId)
.that(mMediator.getDisplayAssignedToUser(userId)).isEqualTo(INVALID_DISPLAY);
expectWithMessage("getMainDisplayAssignedToUser(%s)", userId)
.that(mMediator.getMainDisplayAssignedToUser(userId)).isEqualTo(INVALID_DISPLAY);
}
protected void expectDisplaysAssignedToUserContainsDisplayId(