Only try disabling quiet mode
The underlying API has slightly changed to require the profile
challenge if the profile that we're trying to enable hasn't been
unlocked yet.
Bug: 27764124
Change-Id: I9efb3d3ed49034b573abb4c18119ffadcccfe947
diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java
index 927ad23..852d33a 100644
--- a/src/com/android/settings/accounts/AccountSettings.java
+++ b/src/com/android/settings/accounts/AccountSettings.java
@@ -251,7 +251,11 @@
ProfileData profileData = mProfiles.valueAt(i);
if (preference == profileData.workModeSwitch) {
final int userId = profileData.userInfo.id;
- mUm.setQuietModeEnabled(userId, !((boolean) newValue));
+ if ((boolean) newValue) {
+ mUm.trySetQuietModeDisabled(userId, null);
+ } else {
+ mUm.setQuietModeEnabled(userId, true);
+ }
return true;
}
}
diff --git a/src/com/android/settings/dashboard/conditional/WorkModeCondition.java b/src/com/android/settings/dashboard/conditional/WorkModeCondition.java
index f46b495..3d9958b 100644
--- a/src/com/android/settings/dashboard/conditional/WorkModeCondition.java
+++ b/src/com/android/settings/dashboard/conditional/WorkModeCondition.java
@@ -90,7 +90,7 @@
@Override
public void onActionClick(int index) {
if (index == 0) {
- mUm.setQuietModeEnabled(mUserHandle.getIdentifier(), false);
+ mUm.trySetQuietModeDisabled(mUserHandle.getIdentifier(), null);
setActive(false);
} else {
throw new IllegalArgumentException("Unexpected index " + index);