Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use hasBadge instead of isManagedProfile"

Browse Source
This commit is contained in:
Adam Bookatz
2020-10-08 17:39:58 +00:00
committed by Android (Google) Code Review
parent eb806d847d 82194b8fe0
commit 0570c29094
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/util/IconDrawableFactory.java
View File

@@ -48,7 +48,7 @@ public class IconDrawableFactory {
}
protected boolean needsBadging(ApplicationInfo appInfo, @UserIdInt int userId) {
return appInfo.isInstantApp() || mUm.isManagedProfile(userId);
return appInfo.isInstantApp() || mUm.hasBadge(userId);
}
@UnsupportedAppUsage

7
services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
View File

@@ -630,8 +630,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
final long identity = Binder.clearCallingIdentity();
try {
if (provider.maskedBySuspendedPackage) {
UserInfo userInfo = mUserManager.getUserInfo(providerUserId);
showBadge = userInfo.isManagedProfile();
showBadge = mUserManager.hasBadge(providerUserId);
final String suspendingPackage = mPackageManagerInternal.getSuspendingPackage(
providerPackage, providerUserId);
if (PLATFORM_PACKAGE_NAME.equals(suspendingPackage)) {
@@ -3619,7 +3618,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
long token = Binder.clearCallingIdentity();
try {
UserInfo userInfo = mUserManager.getUserInfo(userId);
if (userInfo != null && userInfo.isManagedProfile()) {
if (userInfo != null && userInfo.isProfile()) {
UserInfo parentInfo = mUserManager.getProfileParent(userId);
if (parentInfo != null
&& !isUserRunningAndUnlocked(parentInfo.getUserHandle().getIdentifier())) {
@@ -3634,7 +3633,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
private boolean isProfileWithUnlockedParent(int userId) {
UserInfo userInfo = mUserManager.getUserInfo(userId);
if (userInfo != null && userInfo.isManagedProfile()) {
if (userInfo != null && userInfo.isProfile()) {
UserInfo parentInfo = mUserManager.getProfileParent(userId);
if (parentInfo != null
&& mUserManager.isUserUnlockingOrUnlocked(parentInfo.getUserHandle())) {