diff options
| author | Chet Haase <chet@google.com> | 2013-09-05 17:07:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-05 17:07:30 +0000 |
| commit | a9fa33b366e82f330ec8a68b616896876e7ddc46 (patch) | |
| tree | 4984d5112645dc0967aa687043869e35a3bc3608 /core/java/android/app/ContextImpl.java | |
| parent | 217ecacd18407ed6be2dd9a7f062f84103eddb32 (diff) | |
| parent | e8222dddaf2e3da14380101e818d4254899e0c0d (diff) | |
| download | frameworks_base-a9fa33b366e82f330ec8a68b616896876e7ddc46.zip frameworks_base-a9fa33b366e82f330ec8a68b616896876e7ddc46.tar.gz frameworks_base-a9fa33b366e82f330ec8a68b616896876e7ddc46.tar.bz2 | |
Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-dev
Diffstat (limited to 'core/java/android/app/ContextImpl.java')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index f10290d..5c49dd2 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -726,7 +726,7 @@ class ContextImpl extends Context { // name. This happened to work because when we generated the file name // we would stringify it to "null.xml". Nice. if (mPackageInfo.getApplicationInfo().targetSdkVersion < - Build.VERSION_CODES.KEY_LIME_PIE) { + Build.VERSION_CODES.KITKAT) { if (name == null) { name = "null"; } @@ -1453,7 +1453,7 @@ class ContextImpl extends Context { public ComponentName startServiceAsUser(Intent service, UserHandle user) { try { if (service.getComponent() == null && service.getPackage() == null) { - if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.KEY_LIME_PIE) { + if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.KITKAT) { IllegalArgumentException ex = new IllegalArgumentException( "Service Intent must be explicit: " + service); Log.e(TAG, "This will become an error", ex); @@ -1485,7 +1485,7 @@ class ContextImpl extends Context { public boolean stopServiceAsUser(Intent service, UserHandle user) { try { if (service.getComponent() == null && service.getPackage() == null) { - if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.KEY_LIME_PIE) { + if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.KITKAT) { IllegalArgumentException ex = new IllegalArgumentException( "Service Intent must be explicit: " + service); Log.e(TAG, "This will become an error", ex); @@ -1528,7 +1528,7 @@ class ContextImpl extends Context { throw new RuntimeException("Not supported in system context"); } if (service.getComponent() == null && service.getPackage() == null) { - if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.KEY_LIME_PIE) { + if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.KITKAT) { IllegalArgumentException ex = new IllegalArgumentException( "Service Intent must be explicit: " + service); Log.e(TAG, "This will become an error", ex); |