| 6437205648e1948685821490a585198010d1606b |
|
16-Jun-2016 |
Victor Chang <vichang@google.com> |
Merge "Fix that work apps settings page crash after changing work profile to use separated lock" into nyc-dev
|
| 26704957fe48d75a5b4f3a51cff520a9e4d8b82c |
|
13-Jun-2016 |
Makoto Onuki <omakoto@google.com> |
Don't take the DPMS lock in DPMI.createPackageSuspendedDialogIntent
This method is called by AM with the lock held, so can't take the
DPMS lock.
It still takes a different lock, but we don't call into the external
world while holding this lock, so this is fine.
Bug 29242568
Change-Id: Idbecdd7d97385ca66c693903443471fdbae833e6
/frameworks/base/services/core/java/com/android/server/am/ActivityStartInterceptor.java
|
| 89d4a9a189b93ce8a6e76f40a19adc38889efed8 |
|
14-Jun-2016 |
Victor Chang <vichang@google.com> |
Fix that work apps settings page crash after changing work profile to use separated lock
Change-Id: I77df9d4a6e23ca6041da15f5908436375efa3b21
Fix: 29176549
/frameworks/base/services/core/java/com/android/server/am/ActivityStartInterceptor.java
|
| 853304c0b11921db142a3945ab66fae5f0cc7d8a |
|
18-Apr-2016 |
Tony Mak <tonymak@google.com> |
Show work challenge in if user in docked stack is locked
Register docked stack listener in ActivityManagerService.
If the docked stack is leaving minimized state, check whether the user
of the docked stack is locked. If yes, show credential confirmation.
Also, we now show work challenge in home task.
And we now scan the entire top task to handle the case the work app is
somewhere in the middle of the task. (eg: open personal camera in work app)
Bug: 27565539
Bug: 28094505
Change-Id: Iaf0738f43ae916a535b17949ec0f322bbfb194dc
/frameworks/base/services/core/java/com/android/server/am/ActivityStartInterceptor.java
|
| e420c550ee98aefab92bae4017c46c7a969bf132 |
|
06-Apr-2016 |
Rubin Xu <rubinxu@google.com> |
Relaunch previous activity after turning work profile on
When work profile is turned off, attempts to start work app activity is
intercepted and redirected to an information dialog, which gives the
option to turn work profile back on. When the user does turn it back on,
the original activity should be relaunched.
Bug: 27740167
Change-Id: I4c9d5bc949499bdb5d9f2394e13e670a48d43629
/frameworks/base/services/core/java/com/android/server/am/ActivityStartInterceptor.java
|
| 4291c76e8097af550972b51aeda1b0b1dcf4fb5b |
|
24-Mar-2016 |
Tony Mak <tonymak@google.com> |
Use FLAG_ACTIVITY_TASK_ON_HOME to make sure back button brings user to home
In work challenge, we want to show home when user taps back button.
Previously, we do this by launching launcher before showing work challenge.
We now use FLAG_ACTIVITY_TASK_ON_HOME instead.
Bug: 27826548
Change-Id: I74cca611bf00c6f53b4752f2967a0c729ddf2d61
/frameworks/base/services/core/java/com/android/server/am/ActivityStartInterceptor.java
|
| 7a9c34bd7a65bf27a3a7ea83d7a1391667bae50a |
|
11-Mar-2016 |
Sudheer Shanka <sudheersai@google.com> |
Show admin support dialog if app is suspended.
Bug: 26922950
Change-Id: I21f048873244df52d14910cc01a658af476d9149
/frameworks/base/services/core/java/com/android/server/am/ActivityStartInterceptor.java
|
| b93522a7dbe8167e9f88bacd53463c4ae1b01e1c |
|
23-Feb-2016 |
Rubin Xu <rubinxu@google.com> |
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
/frameworks/base/services/core/java/com/android/server/am/ActivityStartInterceptor.java
|
| b1b302660cf5b1b1c5b342cc90eca93b8f66890c |
|
09-Feb-2016 |
Kenny Guy <kennyguy@google.com> |
Support FBE for managed profiles.
Allow launcher to see and attempt to launch non-crypto
aware application when profile is locked.
Hide unlock notification until parent user is unlocked.
Have unlock notitication use confirm credentials to unlock
the profile.
Updated notification strings as per suggestions in mocks
to make it clearer between users and profiles.
Bug: 27038260
Change-Id: If2d2c8148670d814544f4edd44193d15da32a289
/frameworks/base/services/core/java/com/android/server/am/ActivityStartInterceptor.java
|
| 58d25998321d9f4b1b76d18a5af9d42cdbaad30d |
|
21-Jan-2016 |
Rubin Xu <rubinxu@google.com> |
Show dialog when launching work apps is not possible.
There are two cases when this could happen. First is when the work
profile is turned off by the user, and the second is when the profile
owner has suspened the package.
Bug: 22776761
Bug: 22541941
Change-Id: Ibc671e93f87dff0168bb7643494b9d6b45a1a7f9
/frameworks/base/services/core/java/com/android/server/am/ActivityStartInterceptor.java
|