Merge "Remove unnecessary STOPSHIP." into qt-dev

am: ed3136b72d

Change-Id: I8155cbd70d2ad8daffa7b0fc9f67904d8e4ca02a
This commit is contained in:
Amin Shaikh
2019-05-21 11:47:06 -07:00
committed by android-build-merger

View File

@@ -198,8 +198,8 @@ public class OverlayCategoryPreferenceController extends DeveloperOptionsPrefere
@Override @Override
protected void onDeveloperOptionsSwitchDisabled() { protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled(); super.onDeveloperOptionsSwitchDisabled();
// STOPSHIP b/122308197: reset the overlays to the set in // TODO b/133222035: remove these developer settings when the
// Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES // Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES setting is used
setOverlay(PACKAGE_DEVICE_DEFAULT); setOverlay(PACKAGE_DEVICE_DEFAULT);
updateState(mPreference); updateState(mPreference);
} }