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

am 55fe056d: Merge "Don\'t apply encryption password requirements for secondary users" into klp-dev

Browse Source 
* commit '55fe056d96bdb683dce0a4e66e7390d19f23e710':
  Don't apply encryption password requirements for secondary users
This commit is contained in:
Amith Yamasani
2013-08-15 18:09:06 -07:00
committed by Android Git Automerger
parent 44a224cabf 55fe056d96
commit 905c00a405
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -24,6 +24,8 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.os.Bundle; import android.os.Bundle;
import android.os.Process;
import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
@@ -255,6 +257,8 @@ public class ChooseLockGeneric extends PreferenceActivity {
* appropriately.) * appropriately.)
*/ */
private int upgradeQualityForEncryption(int quality) { private int upgradeQualityForEncryption(int quality) {
// Don't upgrade quality for secondary users. Encryption requirements don't apply.
if (Process.myUserHandle() != UserHandle.OWNER) return quality;
int encryptionStatus = mDPM.getStorageEncryptionStatus(); int encryptionStatus = mDPM.getStorageEncryptionStatus();
boolean encrypted = (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE) boolean encrypted = (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE)
|| (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVATING); || (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVATING);