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

Commit 4e33c4f8 authored by fionaxu's avatar fionaxu
Browse files

DO NOT MERGE fix build breakage on k 

Bug: 28557603
Change-Id: I3beae9e8cb6315654d7681d484fbb861fa8b1889
parent be2865a6

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

+1 −4
Original line number Original line Diff line number Diff line
@@ -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;
@@ -144,8 +142,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