From 73168b3376b2897225cb62e462999c8f07fbf56c Mon Sep 17 00:00:00 2001
From: Pierre-Yves Ricau <py@squareup.com>
Date: Sun, 20 Mar 2016 12:32:29 -0700
Subject: [PATCH] Ignore INPUT_METHOD_MANAGER__ROOT_VIEW on M

See #322

Also directly reference Lollipop constant.
---
 .../java/com/squareup/leakcanary/AndroidExcludedRefs.java     | 4 ++--
 .../com/squareup/leakcanary/internal/LeakCanaryInternals.java | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/squareup/leakcanary/AndroidExcludedRefs.java b/src/main/java/com/squareup/leakcanary/AndroidExcludedRefs.java
index bbcb4d1580..e4a9dfd537 100644
--- a/src/main/java/com/squareup/leakcanary/AndroidExcludedRefs.java
+++ b/src/main/java/com/squareup/leakcanary/AndroidExcludedRefs.java
@@ -28,10 +28,10 @@
 import static android.os.Build.VERSION_CODES.JELLY_BEAN;
 import static android.os.Build.VERSION_CODES.KITKAT;
 import static android.os.Build.VERSION_CODES.LOLLIPOP;
+import static android.os.Build.VERSION_CODES.LOLLIPOP_MR1;
 import static android.os.Build.VERSION_CODES.M;
 import static com.squareup.leakcanary.AndroidWatchExecutor.LEAK_CANARY_THREAD_NAME;
 import static com.squareup.leakcanary.internal.LeakCanaryInternals.LG;
-import static com.squareup.leakcanary.internal.LeakCanaryInternals.LOLLIPOP_MR1;
 import static com.squareup.leakcanary.internal.LeakCanaryInternals.MOTOROLA;
 import static com.squareup.leakcanary.internal.LeakCanaryInternals.NVIDIA;
 import static com.squareup.leakcanary.internal.LeakCanaryInternals.SAMSUNG;
@@ -150,7 +150,7 @@ public enum AndroidExcludedRefs {
     }
   },
 
-  INPUT_METHOD_MANAGER__ROOT_VIEW(SDK_INT >= ICE_CREAM_SANDWICH_MR1 && SDK_INT <= LOLLIPOP_MR1) {
+  INPUT_METHOD_MANAGER__ROOT_VIEW(SDK_INT >= ICE_CREAM_SANDWICH_MR1 && SDK_INT <= M) {
     @Override void add(ExcludedRefs.Builder excluded) {
       excluded.instanceField("android.view.inputmethod.InputMethodManager", "mCurRootView")
           .reason("The singleton InputMethodManager is holding a reference to mCurRootView long"
diff --git a/src/main/java/com/squareup/leakcanary/internal/LeakCanaryInternals.java b/src/main/java/com/squareup/leakcanary/internal/LeakCanaryInternals.java
index 973b1b84de..cdb5a0555c 100644
--- a/src/main/java/com/squareup/leakcanary/internal/LeakCanaryInternals.java
+++ b/src/main/java/com/squareup/leakcanary/internal/LeakCanaryInternals.java
@@ -43,8 +43,6 @@
 
 public final class LeakCanaryInternals {
 
-  // SDK INT for API 22.
-  public static final int LOLLIPOP_MR1 = 22;
   public static final String SAMSUNG = "samsung";
   public static final String MOTOROLA = "motorola";
   public static final String LG = "LGE";