Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Iff45a999717998a35cedac459e37efe5204bc383
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Pavel Grafov
2023-05-05 10:05:26 +00:00
committed by Automerger Merge Worker
parent 6ddf5dac70 83b3e82a7c
commit fb09c3c079
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)) {