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

Merge "Guard against duplicate calls to setQuietModeEnabled" into main

Browse Source
This commit is contained in:
Oli Thompson
2023-11-21 13:37:03 +00:00
committed by Android (Google) Code Review
parent a19a7e2cc9 ae10f49ab8
commit c1e33f5080
4 changed files with 64 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/accounts/ManagedProfileQuietModeEnabler.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.accounts;
import android.app.admin.flags.Flags;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -58,7 +59,14 @@ final class ManagedProfileQuietModeEnabler implements DefaultLifecycleObserver {
}
public void setQuietModeEnabled(boolean enabled) {
if (mManagedProfile != null) {
if (mManagedProfile == null) {
return;
}
if (Flags.quietModeCredentialBugFix()) {
if (isQuietModeEnabled() != enabled) {
mUserManager.requestQuietModeEnabled(enabled, mManagedProfile);
}
} else {
mUserManager.requestQuietModeEnabled(enabled, mManagedProfile);
}
}

3
src/com/android/settings/accounts/WorkModePreferenceController.java
View File

@@ -70,6 +70,9 @@ public class WorkModePreferenceController extends BasePreferenceController
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
mQuietModeEnabler.setQuietModeEnabled(!isChecked);
if (android.app.admin.flags.Flags.quietModeCredentialBugFix()) {
updateState(mPreference);
}
}
@Override