PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix battery tip app name is empty"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-06 02:13:25 +00:00
committed by Android (Google) Code Review
parent 9ac285cfac 376ce87f00
commit 61858369d2
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/Utils.java
View File

@@ -749,7 +749,7 @@ public final class Utils extends com.android.settingslib.Utils {
| PackageManager.MATCH_ANY_USER); | PackageManager.MATCH_ANY_USER);
return appInfo.loadLabel(context.getPackageManager()); return appInfo.loadLabel(context.getPackageManager());
} catch (PackageManager.NameNotFoundException e) { } 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; return null;
} }

8
src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java
View File

@@ -30,7 +30,6 @@ import androidx.recyclerview.widget.RecyclerView;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settingslib.utils.StringUtil;
import java.util.List; import java.util.List;
@@ -78,7 +77,12 @@ public class HighUsageAdapter extends RecyclerView.Adapter<HighUsageAdapter.View
holder.appIcon.setImageDrawable( holder.appIcon.setImageDrawable(
Utils.getBadgedIcon(mIconDrawableFactory, mPackageManager, app.packageName, Utils.getBadgedIcon(mIconDrawableFactory, mPackageManager, app.packageName,
UserHandle.getUserId(app.uid))); 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 @Override