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

Commit 61858369 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix battery tip app name is empty"

parents 9ac285cf 376ce87f

src/com/android/settings/Utils.java

+1 −1
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ public final class Utils extends com.android.settingslib.Utils { 
                    | PackageManager.MATCH_ANY_USER);

            return appInfo.loadLabel(context.getPackageManager());

        } catch (PackageManager.NameNotFoundException e) {

            Log.w(TAG, "Unable to find info for package: " + packageName);

            Log.e(TAG, "Unable to find info for package: " + packageName);

        }

        return null;

    }

src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java

+6 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import androidx.recyclerview.widget.RecyclerView; 


import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settingslib.utils.StringUtil;



import java.util.List;
@@ -78,7 +77,12 @@ public class HighUsageAdapter extends RecyclerView.Adapter<HighUsageAdapter.View 
        holder.appIcon.setImageDrawable(

                Utils.getBadgedIcon(mIconDrawableFactory, mPackageManager, app.packageName,

                        UserHandle.getUserId(app.uid)));

        holder.appName.setText(Utils.getApplicationLabel(mContext, app.packageName));

        CharSequence label = Utils.getApplicationLabel(mContext, app.packageName);

        if (label == null) {

            label = app.packageName;

        }



        holder.appName.setText(label);

    }



    @Override