DO NOT MERGE fix build breakage on k
Bug: 28557603 Change-Id: I3beae9e8cb6315654d7681d484fbb861fa8b1889
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user