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

Commit 82194b8f authored by Adam Bookatz's avatar Adam Bookatz
Browse files

Use hasBadge instead of isManagedProfile 

To determine whether a user has a badge, the
correct call is now hasBadge, rather than isManagedProfile.

Currently, the only user that actually can have a badge
is a managed profile, so this change is a no-op. In the future,
if further profile support is expanded, then hasBadge will
be correct.

Bug: 170249807
Test: Treehugger (this cl is a no-op)
Change-Id: I9144c4dc519936dfc5a2aeae0eb0bd91bea89db2
parent 403ae7b4

core/java/android/util/IconDrawableFactory.java

+1 −1
Original line number Diff line number Diff line
@@ -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

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

+3 −4
Original line number Diff line number Diff line
@@ -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())) {