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

Commit 8a233938 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 

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



Change-Id: I56b1f92f0a9db2610f538520ddfbaa9c70895072
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 96ca3982 bb9e856e

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