summaryrefslogtreecommitdiff
path: root/services/appwidget
diff options
context:
space:
mode:
authorSuprabh Shukla <suprabh@google.com>2019-08-27 15:58:03 -0700
committerSuprabh Shukla <suprabh@google.com>2019-09-25 17:11:17 -0700
commitd3278449d7d4d2a56d688fc27bb0c3eb36fb8ed2 (patch)
treee8d23c3b80486f5f31d8e65021c8e9e800816fae /services/appwidget
parentb338ef16569b8e535128ee9e66807f334322139d (diff)
Allowing more than one app to suspend apps
We want to allow wellbeing apps to suspend in managed profiles. This requires changing the internal data design of package-suspend state to allow more than one suspending package, each with their own parameters, namely - dialog info, app extras and launcher extras. Also, removed the restriction of using setPackagesSuspendedAsUser when a PO/DO exists Test: atest com.android.server.pm.PackageUserStateTest atest com.android.server.pm.PackageManagerSettingsTests atest com.android.server.wm.ActivityStartInterceptorTest atest GtsSuspendAppsTestCases Bug: 138812320 Change-Id: If1263142fc9e6687e95af9b8d71ba8eff0c0fae9
Diffstat (limited to 'services/appwidget')
-rw-r--r--services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
index fea4e9047f83..81ce359cc078 100644
--- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
+++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
@@ -631,8 +631,9 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
onClickIntent = mDevicePolicyManagerInternal.createShowAdminSupportIntent(
providerUserId, true);
} else {
- final SuspendDialogInfo dialogInfo = mPackageManagerInternal
- .getSuspendedDialogInfo(providerPackage, providerUserId);
+ final SuspendDialogInfo dialogInfo =
+ mPackageManagerInternal.getSuspendedDialogInfo(providerPackage,
+ suspendingPackage, providerUserId);
onClickIntent = SuspendedAppActivity.createSuspendedAppInterceptIntent(
providerPackage, suspendingPackage, dialogInfo, providerUserId);
}