6 Commits

Author SHA1 Message Date
Jim Miller
a3b5bae9cf Fix the build.
This fixes a bad merge in LockSettingsService.

Change-Id: I941bae77446dd0e94f409f0d64330ca5391f8efa
2013-04-23 18:34:46 -07:00
Jim Miller
952b310280 Merge "Fix bug where owner info wasn't being updated properly." into jb-mr2-dev 2013-04-24 01:04:10 +00:00
Jim Miller
2d8ecf9df0 Fix bug where owner info wasn't being updated properly.
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
2013-04-23 17:36:45 -07:00
Jim Miller
158fe19ff8 Add permission check for owner-info related LockSettings.
Fixes bug 8512972

Change-Id: I372ef892000e5de9075783f06b722e2911cfc90d
2013-04-17 15:26:10 -07:00
Jim Miller
187ec581c6 Move owner info from Settings.Secure to LockSettings
Fixes bug 8512972

Change-Id: Ic046aff0332b78489dda08b1e9e71f4c16154f10
2013-04-16 18:33:43 -07:00
Jeff Sharkey
7a96c39c51 Move lingering services to services.jar.
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
2012-12-11 09:50:50 -08:00