OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cf7518f) | patch
Do not show work challenge when profile is turned off.
authorRubin Xu <rubinxu@google.com>
Tue, 23 Feb 2016 18:21:48 +0000 (18:21 +0000)
committerRubin Xu <rubinxu@google.com>
Tue, 23 Feb 2016 18:21:48 +0000 (18:21 +0000)
commitb93522a7dbe8167e9f88bacd53463c4ae1b01e1c
treed84a183185c04a322d7a252dc691d009e1acd9e7tree | snapshot
parentcf7518f78af84aaafc7cd38ff69eec357a5b3055commit | diff
Do not show work challenge when profile is turned off.

When the profile is turned off, the associated user is not running so it
makes no sense to try to unlock the profile challenge.

Also adjust order of activity startup interception so suspend package takes
precedence, as that's a state user cannot recover from by his own actions.

Bug: 26928131
Change-Id: Ibb4c8ce02ba4ed2e5a5b4366cbe7b59d1535dbd7
services/core/java/com/android/server/am/ActivityStartInterceptor.java diff | blob | history
services/core/java/com/android/server/am/UserController.java diff | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help