Disable bg restriction for "Disallow apps control"

Use RestrictedPreference so it could handle it automatically

Change-Id: Ibf58934639677b88316366b2e00790f9556d0966
Fixes: 64474641
Test: Robotests
This commit is contained in:
jackqdyulei
2018-08-07 15:12:54 -07:00
parent b9b4a68862
commit fd0c472bdc
3 changed files with 35 additions and 15 deletions

View File

@@ -28,6 +28,7 @@ import com.android.settings.fuelgauge.batterytip.BatteryTipDialogFragment;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
@@ -76,6 +77,11 @@ public class BackgroundActivityPreferenceController extends AbstractPreferenceCo
@Override
public void updateState(Preference preference) {
final RestrictedPreference restrictedPreference = (RestrictedPreference) preference;
if (restrictedPreference.isDisabledByAdmin()) {
// If disabled, let RestrictedPreference handle it and do nothing here
return;
}
final int mode = mAppOpsManager
.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, mUid, mTargetPackage);
final boolean whitelisted = mPowerWhitelistBackend.isWhitelisted(mTargetPackage);