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

am: 07c994012c

Change-Id: Iba1b8547910292c33b9ce500fd395c95a6bc81e9
This commit is contained in:
fionaxu
2016-06-08 01:59:04 +00:00
committed by android-build-merger

View File

@@ -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;
@@ -151,8 +149,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