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/content | |
| 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/content')
| -rw-r--r-- | core/java/android/content/Context.java | 4 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 4e2aca0..c9b7d0a 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -3065,11 +3065,11 @@ public abstract class Context { * "content://foo". It will not remove any prefix grants that exist at a * higher level. * - * <p>Prior to {@link android.os.Build.VERSION_CODES#L}, if you did not have + * <p>Prior to {@link android.os.Build.VERSION_CODES#LOLLIPOP}, if you did not have * regular permission access to a Uri, but had received access to it through * a specific Uri permission grant, you could not revoke that grant with this * function and a {@link SecurityException} would be thrown. As of - * {@link android.os.Build.VERSION_CODES#L}, this function will not throw a security exception, + * {@link android.os.Build.VERSION_CODES#LOLLIPOP}, this function will not throw a security exception, * but will remove whatever permission grants to the Uri had been given to the app * (or none).</p> * diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 77981f4..af6f181 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2226,7 +2226,7 @@ public class Intent implements Parcelable, Cloneable { * Same as {@link android.media.AudioManager#ACTION_HEADSET_PLUG}, to be consulted for value * and documentation. * <p>If the minimum SDK version of your application is - * {@link android.os.Build.VERSION_CODES#L}, it is recommended to refer + * {@link android.os.Build.VERSION_CODES#LOLLIPOP}, it is recommended to refer * to the <code>AudioManager</code> constant in your receiver registration code instead. */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) |