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

Merge "New hidden DPM methods: getLogoutUserId() and clearLogoutUser()." into sc-v2-dev am: b3137b3b86

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

Change-Id: I73aded8d5b2f1bd38adba570d2eab4c6d84cdea8
This commit is contained in:
TreeHugger Robot
2021-11-13 01:33:32 +00:00
committed by Automerger Merge Worker
parent 3112603f1c b3137b3b86
commit 3740f52ea4
4 changed files with 59 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -9609,6 +9609,37 @@ public class DevicePolicyManager {
}
}
/**
* Gets the user a {@link #logoutUser(ComponentName)} call would switch to,
* or {@link UserHandle#USER_NULL} if the current user is not in a session.
*
* @hide
*/
@RequiresPermission(android.Manifest.permission.MANAGE_USERS)
public @UserIdInt int getLogoutUserId() {
try {
return mService.getLogoutUserId();
} catch (RemoteException re) {
throw re.rethrowFromSystemServer();
}
}
/**
* Clears the user that {@link #logoutUser(ComponentName)} would switch to.
*
* <p>Typically used by system UI after it logout a session.
*
* @hide
*/
@RequiresPermission(android.Manifest.permission.MANAGE_USERS)
public void clearLogoutUser() {
try {
mService.clearLogoutUser();
} catch (RemoteException re) {
throw re.rethrowFromSystemServer();
}
}
/**
* Called by a device owner to list all secondary users on the device. Managed profiles are not
* considered as secondary users.

2
core/java/android/app/admin/IDevicePolicyManager.aidl
View File

@@ -261,6 +261,8 @@ interface IDevicePolicyManager {
int startUserInBackground(in ComponentName who, in UserHandle userHandle);
int stopUser(in ComponentName who, in UserHandle userHandle);
int logoutUser(in ComponentName who);
int getLogoutUserId();
void clearLogoutUser();
List<UserHandle> getSecondaryUsers(in ComponentName who);
void resetNewUserDisclaimer();

3
packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
View File

@@ -607,6 +607,9 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
} else if (GLOBAL_ACTION_KEY_SCREENSHOT.equals(actionKey)) {
addIfShouldShowAction(tempActions, new ScreenshotAction());
} else if (GLOBAL_ACTION_KEY_LOGOUT.equals(actionKey)) {
// TODO(b/206032495): should call mDevicePolicyManager.getLogoutUserId() instead of
// hardcode it to USER_SYSTEM so it properly supports headless system user mode
// (and then call mDevicePolicyManager.clearLogoutUser() after switched)
if (mDevicePolicyManager.isLogoutEnabled()
&& currentUser.get() != null
&& currentUser.get().id != UserHandle.USER_SYSTEM) {

30
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -9692,7 +9692,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
mStatLogger.dump(pw);
pw.println();
pw.println("Encryption Status: " + getEncryptionStatusName(getEncryptionStatus()));
pw.println("Logout user: " + getLogoutUserId());
pw.println("Logout user: " + getLogoutUserIdUnchecked());
pw.println();
if (mPendingUserCreatedCallbackTokens.isEmpty()) {
@@ -10805,7 +10805,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
boolean switched = false;
// Save previous logout user id in case of failure
int logoutUserId = getLogoutUserId();
int logoutUserId = getLogoutUserIdUnchecked();
synchronized (getLockObject()) {
long id = mInjector.binderClearCallingIdentity();
try {
@@ -10832,7 +10832,14 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
}
private @UserIdInt int getLogoutUserId() {
@Override
public int getLogoutUserId() {
Preconditions.checkCallAuthorization(canManageUsers(getCallerIdentity()));
return getLogoutUserIdUnchecked();
}
private @UserIdInt int getLogoutUserIdUnchecked() {
if (!mInjector.userManagerIsHeadlessSystemUserMode()) {
// mLogoutUserId is USER_SYSTEM as well, but there's no need to acquire the lock
return UserHandle.USER_SYSTEM;
@@ -10842,11 +10849,20 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
}
private void setLogoutUserId(@UserIdInt int userId) {
@Override
public void clearLogoutUser() {
CallerIdentity caller = getCallerIdentity();
Preconditions.checkCallAuthorization(canManageUsers(caller));
Slogf.i(LOG_TAG, "Clearing logout user as requested by %s", caller);
clearLogoutUserUnchecked();
}
private void clearLogoutUserUnchecked() {
if (!mInjector.userManagerIsHeadlessSystemUserMode()) return; // ignore
synchronized (getLockObject()) {
setLogoutUserIdLocked(userId);
setLogoutUserIdLocked(UserHandle.USER_NULL);
}
}
@@ -10943,7 +10959,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
return stopUserUnchecked(callingUserId);
}
int logoutUserId = getLogoutUserId();
int logoutUserId = getLogoutUserIdUnchecked();
if (logoutUserId == UserHandle.USER_NULL) {
// Could happen on devices using headless system user mode when called before calling
// switchUser() or startUserInBackground() first
@@ -10958,7 +10974,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
// This should never happen as target user is determined by getPreviousUserId()
return UserManager.USER_OPERATION_ERROR_UNKNOWN;
}
setLogoutUserId(UserHandle.USER_CURRENT);
clearLogoutUserUnchecked();
} catch (RemoteException e) {
// Same process, should not happen.
return UserManager.USER_OPERATION_ERROR_UNKNOWN;