diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-10-09 13:16:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-09 13:16:40 +0000 |
| commit | 36ae48a850bade17d485cb49dd40a3f11f667ad4 (patch) | |
| tree | 4ae798660a3856c96d0db25e08f415af09d671ab /core/java/android/app/ContextImpl.java | |
| parent | d8497e45c72fbb27961d096499984906af19d35f (diff) | |
| parent | d83e9e42805e340384f30199777fbc472c5c6f20 (diff) | |
| download | frameworks_base-36ae48a850bade17d485cb49dd40a3f11f667ad4.zip frameworks_base-36ae48a850bade17d485cb49dd40a3f11f667ad4.tar.gz frameworks_base-36ae48a850bade17d485cb49dd40a3f11f667ad4.tar.bz2 | |
am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
* commit 'd83e9e42805e340384f30199777fbc472c5c6f20':
Put in real "code" (aka marketing) name.
Diffstat (limited to 'core/java/android/app/ContextImpl.java')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index e9340eb..7fafc38 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -148,7 +148,6 @@ import android.app.trust.TrustManager; import com.android.internal.annotations.GuardedBy; import com.android.internal.app.IAppOpsService; import com.android.internal.os.IDropBoxManagerService; -import com.android.internal.telecom.ITelecomService; import java.io.File; import java.io.FileInputStream; @@ -1671,7 +1670,7 @@ class ContextImpl extends Context { private void validateServiceIntent(Intent service) { if (service.getComponent() == null && service.getPackage() == null) { - if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.L) { + if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.LOLLIPOP) { IllegalArgumentException ex = new IllegalArgumentException( "Service Intent must be explicit: " + service); throw ex; |