summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/LockSettingsService.java
Commit message (Expand)AuthorAgeFilesLines
* am ca9904d0: am a3b5bae9: Fix the build.Jim Miller2013-04-231-3/+0
|\
| * Fix the build.Jim Miller2013-04-231-3/+0
* | am 035f82b3: am 952b3102: Merge "Fix bug where owner info wasn\'t being updat...Jim Miller2013-04-231-16/+24
|\ \ | |/
| * Merge "Fix bug where owner info wasn't being updated properly." into jb-mr2-devJim Miller2013-04-241-16/+24
| |\
| | * Fix bug where owner info wasn't being updated properly.Jim Miller2013-04-231-16/+24
* | | resolved conflicts for merge of 6825c478 to masterJim Miller2013-04-171-3/+21
|\ \ \ | |/ /
| * | Add permission check for owner-info related LockSettings.Jim Miller2013-04-171-8/+17
| |/
* | resolved conflicts for merge of 2f6a2526 to masterJim Miller2013-04-171-13/+53
|\ \ | |/
| * Move owner info from Settings.Secure to LockSettingsJim Miller2013-04-161-13/+53
* | Move keyguard to its own process.Jim Miller2013-02-271-21/+5
|/
* Move lingering services to services.jar.Jeff Sharkey2012-12-111-0/+408