From 66dba9479749b8dcdf16627ac2fcab65652e783e Mon Sep 17 00:00:00 2001
From: Amin Shaikh <ashaikh@google.com>
Date: Mon, 20 May 2019 21:36:57 +0000
Subject: [PATCH] Remove unnecessary STOPSHIP.

THEME_CUSTOMIZATION_OVERLAY_PACKAGES will no be set in Q. When it is set, these developer settings will be removed entirely.

Change-Id: Ic33bb68a4e4a0fabc6731169ef96ecd386dc441e
Fixes: 122308197
Test: presubmit
---
 .../development/OverlayCategoryPreferenceController.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/development/OverlayCategoryPreferenceController.java b/src/com/android/settings/development/OverlayCategoryPreferenceController.java
index 7a2ee08020f..6e0b2d00f6b 100644
--- a/src/com/android/settings/development/OverlayCategoryPreferenceController.java
+++ b/src/com/android/settings/development/OverlayCategoryPreferenceController.java
@@ -198,8 +198,8 @@ public class OverlayCategoryPreferenceController extends DeveloperOptionsPrefere
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
         super.onDeveloperOptionsSwitchDisabled();
-        // STOPSHIP b/122308197: reset the overlays to the set in
-        // Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES
+        // TODO b/133222035: remove these developer settings when the
+        // Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES setting is used
         setOverlay(PACKAGE_DEVICE_DEFAULT);
         updateState(mPreference);
     }