commit 6e556092f5d005938596196fefd0aa1fcc006a90
author Daniel U <uda@google.com> Fri Apr 01 18:44:13 2016 +0100
committer Daniel U <uda@google.com> Mon Apr 04 14:55:56 2016 +0100
tree 8579424f5d38efe10d19f9d787f152b51a636067
parent 9069181c847168896c6fac97e8869944c97f0f2e

Allow user to hide sensitive notifications with no work challenge

When a user upgrades to N, her work profile is automatically
unified even though no work challenge setting is shown to the user
if the user has not upgraded her DPC. Allow the user to hide
sensitive notifications based on whethere there's a profile, but not
on whether there is a work challenge.

Bug:27673591
Change-Id: Iec41dda2d9e479597b3e593e7f9b7f1c0fcd2a49

src/com/android/settings/notification/ConfigureNotificationSettings.java

diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java
index f8ac7dd..4d50461 100644
--- a/src/com/android/settings/notification/ConfigureNotificationSettings.java
+++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java
@@ -75,9 +75,14 @@
         mContext = getActivity();
         mProfileChallengeUserId = Utils.getManagedProfileId(
                 UserManager.get(mContext), UserHandle.myUserId());
-        mSecure = new LockPatternUtils(getActivity()).isSecure(UserHandle.myUserId());
+
+        final LockPatternUtils utils = new LockPatternUtils(getActivity());
+        final boolean isUnified =
+                !utils.isSeparateProfileChallengeEnabled(mProfileChallengeUserId);
+
+        mSecure = utils.isSecure(UserHandle.myUserId());
         mSecureProfile = (mProfileChallengeUserId != UserHandle.USER_NULL)
-                && new LockPatternUtils(getActivity()).isSecure(mProfileChallengeUserId);
+                && (utils.isSecure(mProfileChallengeUserId) || (isUnified && mSecure));
 
         addPreferencesFromResource(R.xml.configure_notification_settings);