Paul Crowley 3ddb6d5fe2 Merge "Two phases to set the password for disk encryption" into nyc-dev ...

am: 56a9395aeb

* commit '56a9395aeb198e0a7db5e9666cc81ba7ce5f8e0d':
  Two phases to set the password for disk encryption

Change-Id: Ieac13a4c2775e3d2bc5463f4161c6e8b151bf6c9

2016-05-18 22:50:37 +00:00

..

accessibility

Don't disrupt a11y state when user is unlocked.

2016-05-11 16:24:13 -07:00

appwidget

Return from onUserUnlocked if user is no longer unlocked

2016-05-04 17:48:41 -07:00

backup

Explicitly close pipe end when we cease operations...

2016-05-18 19:24:32 +00:00

core

Merge "Two phases to set the password for disk encryption" into nyc-dev

2016-05-18 22:50:37 +00:00

devicepolicy

Update RestrictedLockUtils to use UM.getUserRestrictionSource.

2016-05-17 13:27:27 -07:00

java/com/android/server

Pinner service for pinning files into memory

2016-05-12 13:12:20 -07:00

midi

Init MidiService once system user gets unlocked.

2016-05-09 12:51:18 -07:00

net

Merge "Use APF program to drop non-IP non-ARP broadcasts" into nyc-dev

2016-05-13 17:14:47 +00:00

print

Merge "Check if records is inited before removing items" into nyc-dev

2016-05-02 23:32:39 +00:00

restrictions

…

tests

Merge "Make some of the UID-based VPN code reusable" into nyc-dev

2016-05-17 17:30:01 +00:00

usage

…

usb

…

voiceinteraction

Fix multi-window assiststructure trashing

2016-05-10 12:17:51 -07:00

Android.mk

…