From 914c08241892efa9c59a97f01aab8426a8ac8c60 Mon Sep 17 00:00:00 2001 From: Achim Thesmann Date: Sat, 14 Jan 2023 05:51:59 +0000 Subject: [PATCH 1/2] Explictly Grant Background Activity Launch permission. This is to fix tests that fail without granting BAL privileges from the creator's side. Test: atest MultiDisplayActivityLaunchTests ModelMultiCallbacksTest PreSimpleSaveActivityTest SimpleSaveActivityTest Bug: 261780465 Change-Id: I620b5c55dfc6fa9431b968028c3eef16b724820b --- .../com/android/server/appwidget/AppWidgetServiceImpl.java | 5 +++-- 1 file 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 7df48994655dd..e86d9978346e2 100644 --- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java +++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java @@ -1028,8 +1028,9 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku intent.setComponent(provider.getInfoLocked(mContext).configure); intent.setFlags(secureFlags); - final ActivityOptions options = ActivityOptions.makeBasic(); - options.setIgnorePendingIntentCreatorForegroundState(true); + final ActivityOptions options = + ActivityOptions.makeBasic().setPendingIntentCreatorBackgroundActivityStartMode( + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_DENIED); // All right, create the sender. final long identity = Binder.clearCallingIdentity(); From 32880a1671ae6bacc9712e057fbdad141c7bc45f Mon Sep 17 00:00:00 2001 From: Achim Thesmann Date: Sat, 14 Jan 2023 05:52:00 +0000 Subject: [PATCH 2/2] Explictly Grant Background Activity Launch permission. This is to fix tests that fail without granting BAL privileges from the creator's side. Test: atest MultiDisplayActivityLaunchTests ModelMultiCallbacksTest PreSimpleSaveActivityTest SimpleSaveActivityTest Bug: 261780465 Change-Id: I095b2ba29ed56c324c5bc7fc889d0c232087562f --- .../core/java/com/android/server/StorageManagerService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index 64358696b07f9..653c5d141b87c 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -3380,8 +3380,9 @@ class StorageManagerService extends IStorageManager.Stub appInfo.manageSpaceActivityName); intent.setFlags(FLAG_ACTIVITY_NEW_TASK); - final ActivityOptions options = ActivityOptions.makeBasic(); - options.setIgnorePendingIntentCreatorForegroundState(true); + final ActivityOptions options = ActivityOptions.makeBasic() + .setPendingIntentCreatorBackgroundActivityStartMode( + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_DENIED); PendingIntent activity = PendingIntent.getActivity(targetAppContext, requestCode, intent,