diff options
| author | 2016-06-08 01:49:39 +0000 | |
|---|---|---|
| committer | 2016-06-08 01:49:39 +0000 | |
| commit | 07c994012cf4a5878519bb64a69044d56a9d59cc (patch) | |
| tree | 6221b568f446c4bf2b9c829c403c79775be4def8 | |
| parent | 4c508465190067dbf71583b5b2a2807229d512a8 (diff) | |
| parent | 4e33c4f8b11f763cc6f32179e412b639f668e9d5 (diff) | |
DO NOT MERGE fix build breakage on k
am: 4e33c4f8b1
Change-Id: I0339ec14a342f6c4a8f77638ffc6d4873a368830
| -rw-r--r-- | core/java/android/content/pm/PackageItemInfo.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/java/android/content/pm/PackageItemInfo.java b/core/java/android/content/pm/PackageItemInfo.java index d862f6b6b328..634ac2902102 100644 --- a/core/java/android/content/pm/PackageItemInfo.java +++ b/core/java/android/content/pm/PackageItemInfo.java @@ -16,8 +16,6 @@ package android.content.pm; -import android.annotation.NonNull; -import android.annotation.SystemApi; import android.content.res.XmlResourceParser; import android.graphics.drawable.Drawable; @@ -144,8 +142,7 @@ public class PackageItemInfo { * * @hide */ - @SystemApi - public @NonNull CharSequence loadSafeLabel(@NonNull PackageManager pm) { + public CharSequence loadSafeLabel(PackageManager pm) { // loadLabel() always returns non-null String label = loadLabel(pm).toString(); // strip HTML tags to avoid <br> and other tags overwriting original message |