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

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

Merge "Don't start work challenge unless auto-cancel." into udc-dev am:... 

Merge "Don't start work challenge unless auto-cancel." into udc-dev am: 83b3e82a am: fb09c3c0 am: 873d6f4a

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



Change-Id: I1c85f758385c6638bef59a6500de6c137ee9891f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 18ab7962 873d6f4a

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java

+5 −4
Original line number Diff line number Diff line
@@ -304,10 +304,11 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte 
            ActivityManager.getService().resumeAppSwitches();

        } catch (RemoteException e) {

        }

        // If we are launching a work activity and require to launch

        // separate work challenge, we defer the activity action and cancel

        // notification until work challenge is unlocked.

        if (isActivityIntent) {

        // If the notification should be cancelled on click and we are launching a work activity in

        // a locked profile with separate challenge, we defer the activity action and cancelling of

        // the notification until work challenge is unlocked. If the notification shouldn't be

        // cancelled, the work challenge will be shown by ActivityManager if necessary anyway.

        if (isActivityIntent && shouldAutoCancel(entry.getSbn())) {

            final int userId = intent.getCreatorUserHandle().getIdentifier();

            if (mLockPatternUtils.isSeparateProfileChallengeEnabled(userId)

                    && mKeyguardManager.isDeviceLocked(userId)) {