Merge "Change option to lock private space from never to after device restart" into main (526fc6f0) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -12451,7 +12451,7 @@ public final class Settings {
		/** @hide */
		public static final int PRIVATE_SPACE_AUTO_LOCK_AFTER_INACTIVITY = 1;
		/** @hide */
		public static final int PRIVATE_SPACE_AUTO_LOCK_NEVER = 2;
		public static final int PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART = 2;

		/**
		* The different auto lock options for private space.
		@@ -12461,7 +12461,7 @@ public final class Settings {
		@IntDef(prefix = {"PRIVATE_SPACE_AUTO_LOCK_"}, value = {
		PRIVATE_SPACE_AUTO_LOCK_ON_DEVICE_LOCK,
		PRIVATE_SPACE_AUTO_LOCK_AFTER_INACTIVITY,
		PRIVATE_SPACE_AUTO_LOCK_NEVER,
		PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface PrivateSpaceAutoLockOption {

services/core/java/com/android/server/pm/UserManagerService.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -567,7 +567,7 @@ public class UserManagerService extends IUserManager.Stub {
		int autoLockPreference =
		Settings.Secure.getIntForUser(mContext.getContentResolver(),
		Settings.Secure.PRIVATE_SPACE_AUTO_LOCK,
		Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_NEVER,
		Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART,
		getMainUserIdUnchecked());
		Slog.i(LOG_TAG, "Auto-lock settings changed to " + autoLockPreference);
		setOrUpdateAutoLockPreferenceForPrivateProfile(autoLockPreference);
		@@ -615,7 +615,7 @@ public class UserManagerService extends IUserManager.Stub {
		int privateSpaceAutoLockPreference =
		Settings.Secure.getIntForUser(mContext.getContentResolver(),
		Settings.Secure.PRIVATE_SPACE_AUTO_LOCK,
		Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_NEVER,
		Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART,
		getMainUserIdUnchecked());
		if (privateSpaceAutoLockPreference
		!= Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_INACTIVITY) {
		@@ -714,7 +714,7 @@ public class UserManagerService extends IUserManager.Stub {
		if (isAutoLockForPrivateSpaceEnabled()) {
		int autoLockPreference = Settings.Secure.getIntForUser(mContext.getContentResolver(),
		Settings.Secure.PRIVATE_SPACE_AUTO_LOCK,
		Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_NEVER,
		Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART,
		getMainUserIdUnchecked());
		boolean isAutoLockOnDeviceLockSelected =
		autoLockPreference == Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_ON_DEVICE_LOCK;
		@@ -1052,7 +1052,8 @@ public class UserManagerService extends IUserManager.Stub {
		setOrUpdateAutoLockPreferenceForPrivateProfile(
		Settings.Secure.getIntForUser(mContext.getContentResolver(),
		Settings.Secure.PRIVATE_SPACE_AUTO_LOCK,
		Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_NEVER, mainUserId));
		Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART,
		mainUserId));
		}
		}

services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -736,9 +736,10 @@ public final class UserManagerServiceTest {
		Mockito.clearInvocations(mKeyguardManager);
		Mockito.clearInvocations(mSpiedContext);

		// Finally, set the preference to don't auto-lock
		// Finally, set the preference to auto-lock only after device restart, which is the default
		// behaviour
		mUms.setOrUpdateAutoLockPreferenceForPrivateProfile(
		Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_NEVER);
		Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART);

		// Verify that inactivity broadcasts are unregistered and keyguard listener was removed
		Mockito.verify(mSpiedContext).unregisterReceiver(any());