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

Browse Source
This commit is contained in:
Pavel Grafov
2023-05-05 09:41:49 +00:00
committed by Android (Google) Code Review
parent e412fb46f4 22db3a091d
commit 83b3e82a7c
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(); ActivityManager.getService().resumeAppSwitches();
} catch (RemoteException e) { } catch (RemoteException e) {
} }
// If we are launching a work activity and require to launch // If the notification should be cancelled on click and we are launching a work activity in
// separate work challenge, we defer the activity action and cancel // a locked profile with separate challenge, we defer the activity action and cancelling of
// notification until work challenge is unlocked. // the notification until work challenge is unlocked. If the notification shouldn't be
if (isActivityIntent) { // cancelled, the work challenge will be shown by ActivityManager if necessary anyway.
if (isActivityIntent && shouldAutoCancel(entry.getSbn())) {
final int userId = intent.getCreatorUserHandle().getIdentifier(); final int userId = intent.getCreatorUserHandle().getIdentifier();
if (mLockPatternUtils.isSeparateProfileChallengeEnabled(userId) if (mLockPatternUtils.isSeparateProfileChallengeEnabled(userId)
&& mKeyguardManager.isDeviceLocked(userId)) { && mKeyguardManager.isDeviceLocked(userId)) {