diff options
author | Alex Chau <alexchau@google.com> | 2015-06-12 11:45:08 +0100 |
---|---|---|
committer | Alex Chau <alexchau@google.com> | 2015-06-18 16:00:16 +0100 |
commit | ccade402782d9b39331ada3859aa00893132e5c9 (patch) | |
tree | c6d556809b431bf73a1392cfc813ef61bcb671fe /src/com/android/settings/SetupChooseLockPassword.java | |
parent | 2c55f738c4336a3f379f94f4142c20a473ae3a9a (diff) | |
download | packages_apps_Settings-ccade402782d9b39331ada3859aa00893132e5c9.zip packages_apps_Settings-ccade402782d9b39331ada3859aa00893132e5c9.tar.gz packages_apps_Settings-ccade402782d9b39331ada3859aa00893132e5c9.tar.bz2 |
Enforce Keyguard policy in Notification Settings
- Applied getKeyguardDisabledFeatures for notification settings and
notification setup page (after settings a screenlock)
- If a notification settings is disabled, the next least secure setting
will be chosen
- Although KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS can be set be
profile, it will not be reflected in both settings page. This is
because it does not affect the owner (user 0), as mentioned in
DevicePolicyManagerService.PROFILE_KEYGUARD_FEATURES_AFFECT_OWNER
- Skip RedactionInterstitial if there is <= 1 options for the user
- Tested with both Setup wizard and settings case, both pattern and
password, as well as toggling the policy on and off
Bug: 19307118
Bug: 17099898
Change-Id: If640d5576caa0163e9942569f7b4643a30bbfe0a
Diffstat (limited to 'src/com/android/settings/SetupChooseLockPassword.java')
-rw-r--r-- | src/com/android/settings/SetupChooseLockPassword.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/SetupChooseLockPassword.java b/src/com/android/settings/SetupChooseLockPassword.java index 080e470..9837562 100644 --- a/src/com/android/settings/SetupChooseLockPassword.java +++ b/src/com/android/settings/SetupChooseLockPassword.java @@ -110,7 +110,9 @@ public class SetupChooseLockPassword extends ChooseLockPassword { @Override protected Intent getRedactionInterstitialIntent(Context context) { Intent intent = SetupRedactionInterstitial.createStartIntent(context); - SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent); + if (intent != null) { + SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent); + } return intent; } |