tag d6f9fc126e4188d6a76bd34b660e7ebc9f2f0075
tagger The Android Open Source Project <initial-contribution@android.com> Mon Jul 06 17:01:35 2020 -0700
object 13cde9e39eb83849f4b7073cf307597f0865ca3f

Android 9.0.0 release 58

commit 13cde9e39eb83849f4b7073cf307597f0865ca3f
author Mill Chen <millchen@google.com> Wed Feb 26 18:41:56 2020 +0800
committer Anis Assi <anisassi@google.com> Thu Mar 12 13:38:06 2020 -0700
tree 2e49a2b2b7a44d12d23e8b4079129db6f301d5a9
parent 65e18e18ebccd397ff379ea374ad50e35953fc82

RESTRICT AUTOMERGE
Allow LockScreenPattern to be launched in the pinning screen

If work profile lock is enabled and work app is pinned, users will get a
black/white screen on the phone. That's because Settings is prevented
from other apps launch any pages of Settings in the pinning mode.

In order to launch some pages of Settings from other apps, we add a
condition to the preventive mechanism and allow the activity inherited
from SettingsBaseActivity to override the condition to have the activity
to be launched from other apps in the pinning mode.

Bug: 137015265
Bug: 135604684
Test: manual test
Change-Id: I8070de79a83350d1658efcb19e983669dad0e673
Merged-In: I8070de79a83350d1658efcb19e983669dad0e673
(cherry picked from commit 8d47205577cb1f37c8db2b7a27cd71190e20a6a1)