diff options
author | Jeff Sharkey <jsharkey@android.com> | 2016-03-22 15:32:31 -0600 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2016-03-27 10:56:48 -0600 |
commit | bd91e2f3f6aca512a02be645b2515b5e3331e177 (patch) | |
tree | 490fcef8a5acef7571dc72e3707abbf9c43abd35 /cmds/am | |
parent | 40e1135ea2780fefecf532fb7a1cc43e26bcecc2 (diff) |
Update PRE_BOOT_COMPLETED for FBE.
Now that CE data isn't available until after a user is unlocked, we
need to delay the PRE_BOOT_COMPLETED broadcasts. This is done by
adding a new RUNNING_UNLOCKING user state to the UserController
lifecycle.
We now track the last fingerprint a user was logged in under, and we
dispatch PRE_BOOT receivers when that fingerprint changes. To work
around battery pull issues, we only persist the updated fingerprint
once all PRE_BOOT receivers have finished. This is less granular
than the original solution, but it's still correct. We only consider
a user as "logged in" once it transitions into the RUNNING_UNLOCKED
state.
When starting a process, track if the user was "unlocked" when
started, so that we only spin up unaware providers in processes
started before user unlock.
Add generic IProgressListener to communicate PRE_BOOT progress and
strings up to lock screen. For now, LockSettingsService just blocks
until finished, but it could display these strings in the future.
Bug: 27220885
Change-Id: I349439776b885acd32f6a578d8951ffd95640be2
Diffstat (limited to 'cmds/am')
-rw-r--r-- | cmds/am/src/com/android/commands/am/Am.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java index 86734b1c222c..221b2d36fcec 100644 --- a/cmds/am/src/com/android/commands/am/Am.java +++ b/cmds/am/src/com/android/commands/am/Am.java @@ -1141,7 +1141,7 @@ public class Am extends BaseCommand { int userId = Integer.parseInt(nextArgRequired()); byte[] token = argToBytes(nextArgRequired()); byte[] secret = argToBytes(nextArgRequired()); - boolean success = mAm.unlockUser(userId, token, secret); + boolean success = mAm.unlockUser(userId, token, secret, null); if (success) { System.out.println("Success: user unlocked"); } else { |