commit a65914f4d796ced0296b40d335c16177854c300e
author Sander Alewijnse <salewijnse@google.com> Thu Sep 18 11:45:53 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 18 11:45:53 2014 +0000
tree ff3d801c2c8de2f580101351c5f7f26beed99818
parent 7d8192e07bcd6de653eba749dffec0fe5c1560df
parent d4710c87e607fbdb59a56e51eef7e6ec4bb56d2c

am 81b375a1: Merge "Update targetSdkVersion check." into lmp-dev

* commit '81b375a12f3b71b7d7ef7582216dc59303247894':
  Update targetSdkVersion check.

core/java/com/android/internal/app/ResolverActivity.java

diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index 107e8c6..22600de 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -491,8 +491,7 @@
     }
 
     private boolean versionNumberAtLeastL(int versionNumber) {
-        // TODO: remove "|| true" once the build code for L is fixed.
-        return versionNumber >= Build.VERSION_CODES.L || true;
+        return versionNumber >= Build.VERSION_CODES.L;
     }
 
     private void setAlwaysButtonEnabled(boolean hasValidSelection, int checkedPos,