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

Commit 516bfcdc 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:... 

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

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



Change-Id: I23b74ff30fb337139a37e0e6461462963230eeee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0e9aafde d5cae70e

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);