Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84f479f6 authored by fionaxu's avatar fionaxu Committed by android-build-merger
Browse files

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

am: 07c99401

Change-Id: Iba1b8547910292c33b9ce500fd395c95a6bc81e9
parents 9a825b0f 07c99401

core/java/android/content/pm/PackageItemInfo.java

+1 −4
Original line number Diff line number Diff line
@@ -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