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

Merge "Fix user id is not used correctly when fetching app info" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-20 20:24:17 +00:00
committed by Android (Google) Code Review
parent 656aad9c93 4e29281b99
commit ea43e8285e
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -976,8 +976,8 @@ public final class Utils extends com.android.settingslib.Utils {
public static Drawable getBadgedIcon(IconDrawableFactory iconDrawableFactory,
PackageManager packageManager, String packageName, int userId) {
try {
final ApplicationInfo appInfo = packageManager.getApplicationInfo(packageName,
PackageManager.GET_META_DATA);
final ApplicationInfo appInfo = packageManager.getApplicationInfoAsUser(
packageName, PackageManager.GET_META_DATA, userId);
return iconDrawableFactory.getBadgedIcon(appInfo, userId);
} catch (PackageManager.NameNotFoundException e) {
return packageManager.getDefaultActivityIcon();

4
src/com/android/settings/fuelgauge/RestrictedAppDetails.java
View File

@@ -131,8 +131,8 @@ public class RestrictedAppDetails extends DashboardFragment {
final CheckBoxPreference checkBoxPreference = new AppCheckBoxPreference(context);
final AppInfo appInfo = mAppInfos.get(i);
try {
final ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(
appInfo.packageName, 0 /* flags */);
final ApplicationInfo applicationInfo = mPackageManager.getApplicationInfoAsUser(
appInfo.packageName, 0 /* flags */, UserHandle.getUserId(appInfo.uid));
checkBoxPreference.setChecked(true);
checkBoxPreference.setTitle(mPackageManager.getApplicationLabel(applicationInfo));
checkBoxPreference.setIcon(