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

Merge "Count quiet mode as "off" for max time off policy" into udc-dev am: ff1e986e40

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

Change-Id: Ib78c03347ef4d541f83a57702bd03e9879f70dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-05-09 14:53:33 +00:00
committed by Automerger Merge Worker
parent bc48ff4c76 ff1e986e40
commit 5599e1ed0a
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1214,7 +1214,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
sendDeviceOwnerUserCommand(DeviceAdminReceiver.ACTION_USER_STOPPED, userHandle); sendDeviceOwnerUserCommand(DeviceAdminReceiver.ACTION_USER_STOPPED, userHandle);
if (isManagedProfile(userHandle)) { if (isManagedProfile(userHandle)) {
Slogf.d(LOG_TAG, "Managed profile was stopped"); Slogf.d(LOG_TAG, "Managed profile was stopped");
updatePersonalAppsSuspension(userHandle, false /* unlocked */); updatePersonalAppsSuspension(userHandle);
} }
} else if (Intent.ACTION_USER_SWITCHED.equals(action)) { } else if (Intent.ACTION_USER_SWITCHED.equals(action)) {
sendDeviceOwnerUserCommand(DeviceAdminReceiver.ACTION_USER_SWITCHED, userHandle); sendDeviceOwnerUserCommand(DeviceAdminReceiver.ACTION_USER_SWITCHED, userHandle);
@@ -1224,8 +1224,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
} }
if (isManagedProfile(userHandle)) { if (isManagedProfile(userHandle)) {
Slogf.d(LOG_TAG, "Managed profile became unlocked"); Slogf.d(LOG_TAG, "Managed profile became unlocked");
final boolean suspended = final boolean suspended = updatePersonalAppsSuspension(userHandle);
updatePersonalAppsSuspension(userHandle, true /* unlocked */);
triggerPolicyComplianceCheckIfNeeded(userHandle, suspended); triggerPolicyComplianceCheckIfNeeded(userHandle, suspended);
} }
} else if (Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE.equals(action)) { } else if (Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE.equals(action)) {
@@ -1252,13 +1251,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
updateSystemUpdateFreezePeriodsRecord(/* saveIfChanged */ true); updateSystemUpdateFreezePeriodsRecord(/* saveIfChanged */ true);
final int userId = getManagedUserId(getMainUserId()); final int userId = getManagedUserId(getMainUserId());
if (userId >= 0) { if (userId >= 0) {
updatePersonalAppsSuspension(userId, mUserManager.isUserUnlocked(userId)); updatePersonalAppsSuspension(userId);
} }
} else if (ACTION_PROFILE_OFF_DEADLINE.equals(action)) { } else if (ACTION_PROFILE_OFF_DEADLINE.equals(action)) {
Slogf.i(LOG_TAG, "Profile off deadline alarm was triggered"); Slogf.i(LOG_TAG, "Profile off deadline alarm was triggered");
final int userId = getManagedUserId(getMainUserId()); final int userId = getManagedUserId(getMainUserId());
if (userId >= 0) { if (userId >= 0) {
updatePersonalAppsSuspension(userId, mUserManager.isUserUnlocked(userId)); updatePersonalAppsSuspension(userId);
} else { } else {
Slogf.wtf(LOG_TAG, "Got deadline alarm for nonexistent profile"); Slogf.wtf(LOG_TAG, "Got deadline alarm for nonexistent profile");
} }
@@ -1268,9 +1267,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
} else if (ACTION_MANAGED_PROFILE_UNAVAILABLE.equals(action)) { } else if (ACTION_MANAGED_PROFILE_UNAVAILABLE.equals(action)) {
notifyIfManagedSubscriptionsAreUnavailable( notifyIfManagedSubscriptionsAreUnavailable(
UserHandle.of(userHandle), /* managedProfileAvailable= */ false); UserHandle.of(userHandle), /* managedProfileAvailable= */ false);
updatePersonalAppsSuspension(userHandle);
} else if (ACTION_MANAGED_PROFILE_AVAILABLE.equals(action)) { } else if (ACTION_MANAGED_PROFILE_AVAILABLE.equals(action)) {
notifyIfManagedSubscriptionsAreUnavailable( notifyIfManagedSubscriptionsAreUnavailable(
UserHandle.of(userHandle), /* managedProfileAvailable= */ true); UserHandle.of(userHandle), /* managedProfileAvailable= */ true);
final boolean suspended = updatePersonalAppsSuspension(userHandle);
triggerPolicyComplianceCheckIfNeeded(userHandle, suspended);
} else if (LOGIN_ACCOUNTS_CHANGED_ACTION.equals(action)) { } else if (LOGIN_ACCOUNTS_CHANGED_ACTION.equals(action)) {
calculateHasIncompatibleAccounts(); calculateHasIncompatibleAccounts();
} }
@@ -3433,7 +3435,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
final int profileUserHandle = getManagedUserId(userHandle); final int profileUserHandle = getManagedUserId(userHandle);
if (profileUserHandle >= 0) { if (profileUserHandle >= 0) {
// Given that the parent user has just started, profile should be locked. // Given that the parent user has just started, profile should be locked.
updatePersonalAppsSuspension(profileUserHandle, false /* unlocked */); updatePersonalAppsSuspension(profileUserHandle);
} else { } else {
suspendPersonalAppsInternal(userHandle, profileUserHandle, false); suspendPersonalAppsInternal(userHandle, profileUserHandle, false);
} }
@@ -20786,7 +20788,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
} }
mInjector.binderWithCleanCallingIdentity(() -> updatePersonalAppsSuspension( mInjector.binderWithCleanCallingIdentity(() -> updatePersonalAppsSuspension(
callingUserId, mUserManager.isUserUnlocked(callingUserId))); callingUserId));
DevicePolicyEventLogger DevicePolicyEventLogger
.createEvent(DevicePolicyEnums.SET_PERSONAL_APPS_SUSPENDED) .createEvent(DevicePolicyEnums.SET_PERSONAL_APPS_SUSPENDED)
@@ -20820,16 +20822,19 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
/** /**
* Checks whether personal apps should be suspended according to the policy and applies the * Checks whether personal apps should be suspended according to the policy and applies the
* change if needed. * change if needed.
*
* @param unlocked whether the profile is currently running unlocked.
*/ */
private boolean updatePersonalAppsSuspension(int profileUserId, boolean unlocked) { private boolean updatePersonalAppsSuspension(int profileUserId) {
final boolean shouldSuspend; final boolean shouldSuspend;
synchronized (getLockObject()) { synchronized (getLockObject()) {
final ActiveAdmin profileOwner = getProfileOwnerAdminLocked(profileUserId); final ActiveAdmin profileOwner = getProfileOwnerAdminLocked(profileUserId);
if (profileOwner != null) { if (profileOwner != null) {
final int notificationState = // Profile is considered "off" when it is either not running or is running locked
updateProfileOffDeadlineLocked(profileUserId, profileOwner, unlocked); // or is in quiet mode, i.e. when the admin cannot sync policies or show UI.
boolean profileUserOff =
!mUserManagerInternal.isUserUnlockingOrUnlocked(profileUserId)
|| mUserManager.isQuietModeEnabled(UserHandle.of(profileUserId));
final int notificationState = updateProfileOffDeadlineLocked(
profileUserId, profileOwner, profileUserOff);
final boolean suspendedExplicitly = profileOwner.mSuspendPersonalApps; final boolean suspendedExplicitly = profileOwner.mSuspendPersonalApps;
final boolean suspendedByTimeout = profileOwner.mProfileOffDeadline == -1; final boolean suspendedByTimeout = profileOwner.mProfileOffDeadline == -1;
Slogf.d(LOG_TAG, Slogf.d(LOG_TAG,
@@ -20854,16 +20859,16 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
* @return notification state * @return notification state
*/ */
private int updateProfileOffDeadlineLocked( private int updateProfileOffDeadlineLocked(
int profileUserId, ActiveAdmin profileOwner, boolean unlocked) { int profileUserId, ActiveAdmin profileOwner, boolean off) {
final long now = mInjector.systemCurrentTimeMillis(); final long now = mInjector.systemCurrentTimeMillis();
if (profileOwner.mProfileOffDeadline != 0 && now > profileOwner.mProfileOffDeadline) { if (profileOwner.mProfileOffDeadline != 0 && now > profileOwner.mProfileOffDeadline) {
Slogf.i(LOG_TAG, "Profile off deadline has been reached, unlocked: " + unlocked); Slogf.i(LOG_TAG, "Profile off deadline has been reached, off: " + off);
if (profileOwner.mProfileOffDeadline != -1) { if (profileOwner.mProfileOffDeadline != -1) {
// Move the deadline far to the past so that it cannot be rolled back by TZ change. // Move the deadline far to the past so that it cannot be rolled back by TZ change.
profileOwner.mProfileOffDeadline = -1; profileOwner.mProfileOffDeadline = -1;
saveSettingsLocked(profileUserId); saveSettingsLocked(profileUserId);
} }
return unlocked ? PROFILE_OFF_NOTIFICATION_NONE : PROFILE_OFF_NOTIFICATION_SUSPENDED; return off ? PROFILE_OFF_NOTIFICATION_SUSPENDED : PROFILE_OFF_NOTIFICATION_NONE;
} }
boolean shouldSaveSettings = false; boolean shouldSaveSettings = false;
if (profileOwner.mSuspendPersonalApps) { if (profileOwner.mSuspendPersonalApps) {
@@ -20880,7 +20885,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
profileOwner.mProfileOffDeadline = 0; profileOwner.mProfileOffDeadline = 0;
shouldSaveSettings = true; shouldSaveSettings = true;
} else if (profileOwner.mProfileOffDeadline == 0 } else if (profileOwner.mProfileOffDeadline == 0
&& (profileOwner.mProfileMaximumTimeOffMillis != 0 && !unlocked)) { && (profileOwner.mProfileMaximumTimeOffMillis != 0 && off)) {
// There profile is locked and there is a policy, but the deadline is not set -> set the // There profile is locked and there is a policy, but the deadline is not set -> set the
// deadline. // deadline.
Slogf.i(LOG_TAG, "Profile off deadline is set."); Slogf.i(LOG_TAG, "Profile off deadline is set.");
@@ -20894,7 +20899,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
final long alarmTime; final long alarmTime;
final int notificationState; final int notificationState;
if (unlocked || profileOwner.mProfileOffDeadline == 0) { if (!off || profileOwner.mProfileOffDeadline == 0) {
alarmTime = 0; alarmTime = 0;
notificationState = PROFILE_OFF_NOTIFICATION_NONE; notificationState = PROFILE_OFF_NOTIFICATION_NONE;
} else if (profileOwner.mProfileOffDeadline - now < MANAGED_PROFILE_OFF_WARNING_PERIOD) { } else if (profileOwner.mProfileOffDeadline - now < MANAGED_PROFILE_OFF_WARNING_PERIOD) {
@@ -21168,7 +21173,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
} }
mInjector.binderWithCleanCallingIdentity( mInjector.binderWithCleanCallingIdentity(
() -> updatePersonalAppsSuspension(userId, mUserManager.isUserUnlocked())); () -> updatePersonalAppsSuspension(userId));
DevicePolicyEventLogger DevicePolicyEventLogger
.createEvent(DevicePolicyEnums.SET_MANAGED_PROFILE_MAXIMUM_TIME_OFF) .createEvent(DevicePolicyEnums.SET_MANAGED_PROFILE_MAXIMUM_TIME_OFF)

2
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
View File

@@ -8600,6 +8600,8 @@ public class DevicePolicyManagerTest extends DpmTestBase {
private void setUserUnlocked(int userHandle, boolean unlocked) { private void setUserUnlocked(int userHandle, boolean unlocked) {
when(getServices().userManager.isUserUnlocked(eq(userHandle))).thenReturn(unlocked); when(getServices().userManager.isUserUnlocked(eq(userHandle))).thenReturn(unlocked);
when(getServices().userManagerInternal.isUserUnlockingOrUnlocked(eq(userHandle)))
.thenReturn(unlocked);
} }
private void prepareMocksForSetMaximumProfileTimeOff() throws Exception { private void prepareMocksForSetMaximumProfileTimeOff() throws Exception {