PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change Never Option to lock private space after device restart" into main

Browse Source
This commit is contained in:
Joseph Vincent
2024-03-28 22:39:13 +00:00
committed by Android (Google) Code Review
parent 748e0d5db9 d4f5641c55
commit 7e3d30c95f
5 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/privatespace/PrivateSpaceMaintainer.java
View File

@@ -19,7 +19,7 @@ package com.android.settings.privatespace;
import static android.os.UserManager.USER_TYPE_PROFILE_PRIVATE;
import static android.provider.Settings.Secure.HIDE_PRIVATESPACE_ENTRY_POINT;
import static android.provider.Settings.Secure.PRIVATE_SPACE_AUTO_LOCK;
import static android.provider.Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_NEVER;
import static android.provider.Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART;
import static android.provider.Settings.Secure.USER_SETUP_COMPLETE;
import android.app.ActivityManager;
@@ -63,7 +63,8 @@ public class PrivateSpaceMaintainer {
public static final int HIDE_PRIVATE_SPACE_ENTRY_POINT_ENABLED_VAL = 1;
/** Default value for private space auto lock settings. */
@Settings.Secure.PrivateSpaceAutoLockOption
public static final int PRIVATE_SPACE_AUTO_LOCK_DEFAULT_VAL = PRIVATE_SPACE_AUTO_LOCK_NEVER;
public static final int PRIVATE_SPACE_AUTO_LOCK_DEFAULT_VAL =
PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART;
public enum ErrorDeletingPrivateSpace {
DELETE_PS_ERROR_NONE,