Reenable variants from switch_

lib/player.js

@@ -5399,6 +5399,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @private
    */
   switch_(variant, clearBuffer = false, safeMargin = 0) {
+    let currentVariant = variant;
     shaka.log.debug('switch_');
     goog.asserts.assert(this.config_.abr.enabled,
         'AbrManager should not call switch while disabled!');
@@ -5410,12 +5411,30 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       return;
     }
 
-    if (variant == this.streamingEngine_.getCurrentVariant()) {
+    // Check if there are disabled variants and reenable if possible
+    const disabledVariants = this.manifest_.variants
+        .some(({disabledTime}) => disabledTime);
+    if (disabledVariants) {
+      const tracksChanged = shaka.util.StreamUtils.applyRestrictions(
+          this.manifest_.variants, this.config_.restrictions,
+          this.maxHwRes_);
+      if (tracksChanged) {
+        const chosenVariant = this.chooseVariant_();
+        if (chosenVariant) {
+          shaka.log.debug('>>>>>>>>>> SWITCHED');
+          currentVariant = chosenVariant;
+        } else {
+          shaka.log.debug('>>>>>>>>>> OPSSS');
+        }
+      }
+    }
+
+    if (currentVariant == this.streamingEngine_.getCurrentVariant()) {
       // This isn't a change.
       return;
     }
 
-    this.switchVariant_(variant, /* fromAdaptation= */ true,
+    this.switchVariant_(currentVariant, /* fromAdaptation= */ true,
         clearBuffer, safeMargin);
   }