Merge pull request #16546 from MicrosoftDocs/lenewsad-patch-4

Update encrypt-your-device-android.md

memdocs/intune/user-help/encrypt-your-device-android.md

@@ -7,7 +7,7 @@ keywords:
 author: lenewsad
 ms.author: lanewsad
 manager: dougeby
-ms.date: 09/23/2020
+ms.date: 11/07/2024
 ms.topic: end-user-help
 ms.service: microsoft-intune
 ms.subservice: end-user
@@ -35,16 +35,16 @@ Device encryption protects your files and folders from unauthorized access if yo
 
 Before you can access school or work resources, your organization might require you to:
 
-* [Encrypt your device](#encrypt-device)
-* [Enable secure startup](#enable-secure-startup)
-* [Set startup passcode, PIN, or other authentication method](#set-startup-passcode)  
+* Encrypt your device
+* Enable secure startup
+* Set a lock screen and startup PIN   
 
 > [!Note]
-> Certain Android devices from Huawei, Vivo, and OPPO can't be encrypted. For more information, see [Device encrypted but app says otherwise](your-device-appears-encrypted-but-cp-says-otherwise-android.md).  
+>  Certain Android devices from Huawei, Vivo, and OPPO can't be encrypted. For more information, see [Device encrypted but app says otherwise](your-device-appears-encrypted-but-cp-says-otherwise-android.md).  
 
 ## Encrypt device
 
-Follow these steps to encrypt your device. Your device may restart several times. The name and location of the encryption option will vary depending on your device manufacturer and Android version. 
+Follow these steps to encrypt your device. Your device may restart more than once. The name and location of the encryption option varies depending on your device manufacturer and Android version. These steps don't apply to newer Android devices, which are encrypted by default when you set up a lock screen.    
 
 1. Open the **Settings** app.
 2. Type **security** or **encrypt** in the search bar to find related settings.  
@@ -56,9 +56,7 @@ Follow these steps to encrypt your device. Your device may restart several times
 
 ## Enable secure startup
 
-Secure startup protects your device by requiring a password or PIN each time the device is turned on. 
-
-The name and location of the secure startup option can vary depending on your device manufacturer and Android version. 
+Secure startup protects your device by requiring a password or PIN each time the device is turned on. The name and location of the secure startup option can vary depending on your device manufacturer and Android version. 
 
 1. Open the **Settings** app.
 2. Type **secure startup** in the app's search bar. 
@@ -69,27 +67,22 @@ The name and location of the secure startup option can vary depending on your de
    * Company Portal app users: Open the app, select your device, and then tap **Check device settings**. 
    * Microsoft Intune app users: Open the app, wait until the screen loads, and then your encryption status should change to compliant.  
 
+## Set lock screen    
 
-## Set startup passcode   
-Once you encrypt your device and enable secure startup, you'll be prompted to set your device PIN, password, or other authentication method (if allowed by your organization). Completing that step will satisfy the startup passcode requirement. 
-
-To set a lock screen on your device or change the type that you're currently using:  
-
-1. Open the **Settings** app.
-2. Type **screen lock** in the app's search bar.
-3. Tap **Screen lock type**.
-4. Tap the screen lock type you want to use and follow the onscreen instructions to confirm.  
+Add a device PIN, password, or other authentication method (if allowed by your organization) to the device. The lock screen appears and prompts for your credentials when you turn on the device and when the device is idle. To set up a lock screen, go to **Settings** > **Security and privacy** > **Lock screen**.  
 
 ## Troubleshoot    
 **Issue**: The encryption button is disabled.   
 
 **Thing to try**: 
-* Make sure your device is fully charged and plugged in. Encryption may take a while and requires a full battery.   
+ Make sure your device is fully charged and plugged in. Encryption could take a while and requires a full battery.    
 
 **Issue**: You see a message saying that you still need to encrypt your device.  
 
-**Things to try**:
-   *  [Set a lock screen](#set-startup-passcode) on your device. 
-   * [Enable secure startup](#enable-secure-startup).
+**Things to try**:  
+
+   * Set a lock screen on your device.
+   * 
+   * Enable secure startup.  
 
 Still need help? Contact your IT support person. Check the [Company Portal website](https://go.microsoft.com/fwlink/?linkid=2010980) or app for your organization's contact information.