Remove flags for removed opt-in server studies (1/2)
Test: check that features are enabled even when prefs files
contains stale flag to turn the feature off.
Bug: 32623647
Change-Id: I4e1f06a9355d4befd7ff17600844b2c5786825c0
diff --git a/src/com/android/contacts/DynamicShortcuts.java b/src/com/android/contacts/DynamicShortcuts.java
index fce2f8b..52307e4 100644
--- a/src/com/android/contacts/DynamicShortcuts.java
+++ b/src/com/android/contacts/DynamicShortcuts.java
@@ -407,8 +407,6 @@
final Flags flags = Flags.getInstance();
Log.d(TAG, "DyanmicShortcuts.initialize\nVERSION >= N_MR1? " +
(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) +
- "\n" + Experiments.DYNAMIC_SHORTCUTS + " enabled? " +
- flags.getBoolean(Experiments.DYNAMIC_SHORTCUTS) +
"\nisJobScheduled? " + isJobScheduled(context) +
"\nminDelay=" +
flags.getInteger(Experiments.DYNAMIC_MIN_CONTENT_CHANGE_UPDATE_DELAY_MILLIS) +
@@ -420,11 +418,7 @@
final DynamicShortcuts shortcuts = new DynamicShortcuts(context);
- if (!Flags.getInstance().getBoolean(Experiments.DYNAMIC_SHORTCUTS)) {
- // Clear dynamic shortcuts if the flag is not enabled. This prevents shortcuts from
- // staying around if it is enabled then later disabled (due to bugs for instance).
- shortcuts.handleFlagDisabled();
- } else if (!shortcuts.hasRequiredPermissions()) {
+ if (!shortcuts.hasRequiredPermissions()) {
final IntentFilter filter = new IntentFilter();
filter.addAction(RequestPermissionsActivity.BROADCAST_PERMISSIONS_GRANTED);
LocalBroadcastManager.getInstance(shortcuts.mContext).registerReceiver(