diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-01-24 03:01:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-01-24 03:01:56 +0000 |
| commit | ea9ae255288dc0c82d9146c3c91035e0d727d19b (patch) | |
| tree | a2810e32a169f5e01ae39ecec0b3951cadb54b48 /core/java/android/content | |
| parent | 05875d3e985b5ffcd8804d58394a1afe01fc430f (diff) | |
| parent | d9841fb68f27bbd6019004962a025b23a831f6c6 (diff) | |
Merge "Fix attr inheritShowWhenLocked cannot read from manifest."
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/pm/ActivityInfo.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index 3cfbe0c6f08a..47034a6df8a7 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -508,7 +508,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { /** * Bit in {@link #privateFlags} indicating if the activity should be shown when locked in case * an activity behind this can also be shown when locked. - * See android.R.attr#inheritShowWhenLocked + * See {@link android.R.attr#inheritShowWhenLocked}. * @hide */ public static final int FLAG_INHERIT_SHOW_WHEN_LOCKED = 0x1; |