Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e00cd80a authored by Benjamin Franz's avatar Benjamin Franz
Browse files

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
parent 1ec5f096

src/com/android/settings/accounts/AccountSettings.java

+5 −1
Original line number Diff line number Diff line
@@ -251,7 +251,11 @@ public class AccountSettings extends SettingsPreferenceFragment 
            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;

            }

        }

src/com/android/settings/dashboard/conditional/WorkModeCondition.java

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ public class WorkModeCondition extends Condition { 
    @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);