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

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

Merge "Don't cancel notifications when pausing work apps" into udc-dev am: 7c966b0c 

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



Change-Id: I98edca147825f335c445306548486376f2ef68ee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3d2e5c24 7c966b0c

services/core/java/com/android/server/notification/NotificationManagerService.java

100755 → 100644
+1 −1
Original line number Diff line number Diff line
@@ -1843,7 +1843,7 @@ public class NotificationManagerService extends SystemService { 
                }

            } else if (action.equals(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE)) {

                int userHandle = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, -1);

                if (userHandle >= 0) {

                if (userHandle >= 0 && !mDpm.isKeepProfilesRunningEnabled()) {

                    cancelAllNotificationsInt(MY_UID, MY_PID, null, null, 0, 0, true, userHandle,

                            REASON_PROFILE_TURNED_OFF, null);

                    mSnoozeHelper.clearData(userHandle);