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

Commit dd244fe8 authored by Pavel Grafov's avatar Pavel Grafov Committed by Automerger Merge Worker
Browse files

Merge "Show correct dialog for paused profile widgets" into udc-dev am: bb9e856e am: 6c9dd313 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23122029



Change-Id: Idce86e89441787e9491aeac0e2963ed179c75d01
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e6e8a7e1 6c9dd313

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

+5 −4
Original line number Diff line number Diff line
@@ -558,10 +558,14 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
        try {

            final Intent onClickIntent;



            if (provider.maskedBySuspendedPackage) {

            if (provider.maskedByQuietProfile) {

                showBadge = true;

                onClickIntent = UnlaunchableAppActivity.createInQuietModeDialogIntent(appUserId);

            } else if (provider.maskedBySuspendedPackage) {

                showBadge = mUserManager.hasBadge(appUserId);

                final String suspendingPackage = mPackageManagerInternal.getSuspendingPackage(

                        appInfo.packageName, appUserId);

                // TODO(b/281839596): don't rely on platform always meaning suspended by admin.

                if (PLATFORM_PACKAGE_NAME.equals(suspendingPackage)) {

                    onClickIntent = mDevicePolicyManagerInternal.createShowAdminSupportIntent(

                            appUserId, true);
@@ -575,9 +579,6 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
                            appInfo.packageName, suspendingPackage, dialogInfo, null, null,

                            appUserId);

                }

            } else if (provider.maskedByQuietProfile) {

                showBadge = true;

                onClickIntent = UnlaunchableAppActivity.createInQuietModeDialogIntent(appUserId);

            } else /* provider.maskedByLockedProfile */ {

                showBadge = true;

                onClickIntent = mKeyguardManager