DO NOT MERGE fix build breakage on k

am: 4e33c4f8b1

Change-Id: I0339ec14a342f6c4a8f77638ffc6d4873a368830
This commit is contained in:
fionaxu
2016-06-08 01:49:39 +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;
@@ -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