From 0dd6fc7b1eda12925a255bd3ab6f35975e4ea490 Mon Sep 17 00:00:00 2001
From: Chris Banes <chrisbanes@google.com>
Date: Wed, 30 Nov 2016 04:00:35 +0000
Subject: [PATCH] Merge "Fix TextInputLayout clearing the EditText tint" into
 mnc-ub-dev am: 403e480

* commit '403e4802cae0b5354cac650f26e1a4f5e74b696c':
  Fix TextInputLayout clearing the EditText tint

GitOrigin-RevId=5b52850af5eb41669b8b741518d316b40be9d676

PiperOrigin-RevId: 140560422
---
 src/android/support/design/widget/TextInputLayout.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/android/support/design/widget/TextInputLayout.java b/src/android/support/design/widget/TextInputLayout.java
index 48b1152ab..bbca32bdb 100644
--- a/src/android/support/design/widget/TextInputLayout.java
+++ b/src/android/support/design/widget/TextInputLayout.java
@@ -25,6 +25,7 @@ import android.graphics.PorterDuff;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.DrawableContainer;
+import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.annotation.NonNull;
@@ -719,6 +720,11 @@ public class TextInputLayout extends LinearLayout {
     }
 
     private void ensureBackgroundDrawableStateWorkaround() {
+        final int sdk = Build.VERSION.SDK_INT;
+        if (sdk != 21 || sdk != 22) {
+            // The workaround is only required on API 21-22
+            return;
+        }
         final Drawable bg = mEditText.getBackground();
         if (bg == null) {
             return;