Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE fix build breakage on k am: 4e33c4f8b1

Browse Source 
am: 07c994012c

Change-Id: Iba1b8547910292c33b9ce500fd395c95a6bc81e9
This commit is contained in:
fionaxu
2016-06-08 01:59:04 +00:00
committed by android-build-merger
parent 9a825b0fd5 07c994012c
commit 84f479f6b5
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/content/pm/PackageItemInfo.java
View File

@@ -16,8 +16,6 @@
package android.content.pm; package android.content.pm;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.content.res.XmlResourceParser; import android.content.res.XmlResourceParser;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
@@ -151,8 +149,7 @@ public class PackageItemInfo {
* *
* @hide * @hide
*/ */
@SystemApi public CharSequence loadSafeLabel(PackageManager pm) {
public @NonNull CharSequence loadSafeLabel(@NonNull PackageManager pm) {
// loadLabel() always returns non-null // loadLabel() always returns non-null
String label = loadLabel(pm).toString(); String label = loadLabel(pm).toString();
// strip HTML tags to avoid <br> and other tags overwriting original message // strip HTML tags to avoid <br> and other tags overwriting original message