summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/LockSettingsService.java
Commit message (Collapse)AuthorAgeFilesLines
* am ca9904d0: am a3b5bae9: Fix the build.Jim Miller2013-04-231-3/+0
|\ | | | | | | | | * commit 'ca9904d02147daf26def085f7b72d83d2abbd007': Fix the build.
| * Fix the build.Jim Miller2013-04-231-3/+0
| | | | | | | | | | | | This fixes a bad merge in LockSettingsService. Change-Id: I941bae77446dd0e94f409f0d64330ca5391f8efa
* | am 035f82b3: am 952b3102: Merge "Fix bug where owner info wasn\'t being ↵Jim Miller2013-04-231-16/+24
|\ \ | |/ | | | | | | | | | | updated properly." into jb-mr2-dev * commit '035f82b3a7a3517d97a7267f7f6d6b723b8b7e43': Fix bug where owner info wasn't being updated properly.
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a bug where older platforms only stored the 'enabled' value if the checkbox in Settings was toggled at least once. This caused the checkbox to be checked off when upgrading the device. The code now mimicks the old behavior by detecting a non-empty info string and setting 'enabled' appropriately. Fixes bug 8659048 Change-Id: If2431d54f168a0aab286628165dd3f6b4a0d5cf8
* | | resolved conflicts for merge of 6825c478 to masterJim Miller2013-04-171-3/+21
|\ \ \ | |/ / | | | | | | Change-Id: Id9657db0b3623c329ae2cff3916c2d0eb4301dd7
| * | Add permission check for owner-info related LockSettings.Jim Miller2013-04-171-8/+17
| |/ | | | | | | | | | | Fixes bug 8512972 Change-Id: I372ef892000e5de9075783f06b722e2911cfc90d
* | resolved conflicts for merge of 2f6a2526 to masterJim Miller2013-04-171-13/+53
|\ \ | |/ | | | | Change-Id: Ie51d3a63f4d4d5bad7ef16ad84ef6ad5acdaa64a
| * Move owner info from Settings.Secure to LockSettingsJim Miller2013-04-161-13/+53
| | | | | | | | | | | | Fixes bug 8512972 Change-Id: Ic046aff0332b78489dda08b1e9e71f4c16154f10
* | Move keyguard to its own process.Jim Miller2013-02-271-21/+5
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation to moving keyguard into its own process. Moved keyguard source and resources into new .apk. Got basic test app working. Still need to implement MockPatternUtils and means to pass it into KeyguardService with local binder interface. Added new ACCESS_KEYGUARD_SECURE_STORAGE permission. Temporarily disabled USER_PRESENT broadcast. Remove unintentional whitespace changes in PhoneWindowManager, etc. Checkpoint basic working version. Move to systemui process. Synchronize with TOT. Sync with recent user API changes. Fix bug with returing interface instead of stub for IKeyguardResult. Create KeyguardServiceDelegate to allow for runtime-selectable local or remote interface. More keyguard crash robustness. Keyguard crash recovery working. Currently fails safe (locked). Fix selector view which was still using frameworks resources. Remove more references to internal framework variables. Use aliases for those we should move but currently have dependencies. Allow runtime switching between service and local mode. Fix layout issue on tablets where orientation was reading the incorrect constant from the framework. Remove more framework dependencies. Fix PIN keyboard input. Remove unnecessary copy of orientation attrs. Remove unused user selector widget and attempt to get multi user working again. Fix multi-user avatar icon by grabbing it from UserManager rather than directly since keyguard can no longer read it. Merge with AppWidget userId changes in master. Change-Id: I254d6fc6423ae40f6d7fef50aead4caa701e5ad2
* Move lingering services to services.jar.Jeff Sharkey2012-12-111-0/+408
This helps reduce the pressure on framework.jar, and makes it clear that it should only be used by the system_server. Bug: 7333397 Change-Id: I0858904239535380fbf30562b793e277d8c3f054