summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '25a217c' into merge2Etan Cohen2015-04-242-72/+66
|\
| * Add captive portal API.Paul Jensen2015-04-162-72/+66
| * LCE service implementation - connectivity sidefenglu2015-04-151-0/+18
* | Merge commit '6ddbb5e' into merge2Etan Cohen2015-04-241-0/+1
|\ \ | |/
| * Bluetooth LE background operation mode (2/2)Nitin Arora2015-04-151-37/+247
* | am 3846d3a4: am 6d856bfb: am cf7d2d95: Merge "[ActivityManager] Avoid orphan ...Olawale Ogunwale2015-04-241-5/+8
|\ \
| * \ am cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."Olawale Ogunwale2015-04-241-5/+8
| |\ \
| | * \ Merge "[ActivityManager] Avoid orphan ContentProviderRecord."Olawale Ogunwale2015-04-241-5/+8
| | |\ \
| | | * | [ActivityManager] Avoid orphan ContentProviderRecord.riddle_hsu2014-11-151-5/+8
| * | | | am d24cc193: am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags ...Svet Ganov2015-04-231-3/+1
| |\ \ \ \
| | * \ \ \ am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating...Svet Ganov2015-04-231-3/+1
| | |\ \ \ \
| | | * \ \ \ am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget c...Svet Ganov2015-04-231-3/+1
| | | |\ \ \ \
| | | | * | | | DO NOT MERGE Don't take flags when creating app widget config activity.Svet Ganov2015-04-201-3/+1
* | | | | | | | Remove line wrapping for publickey encoding.dcashman2015-04-241-1/+1
* | | | | | | | Cleaned-up unused session argument.Wale Ogunwale2015-04-245-7/+7
* | | | | | | | Merge "Restrict setting the profile/device owner with a signature-level permi...Nicolas Prevot2015-04-241-43/+74
|\ \ \ \ \ \ \ \
| * | | | | | | | Restrict setting the profile/device owner with a signature-level permission.Nicolas Prevot2015-04-241-43/+74
* | | | | | | | | Merge "AudioService: Fix mConnectedDevices iteration issues."John Spurlock2015-04-241-19/+26
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | AudioService: Fix mConnectedDevices iteration issues.John Spurlock2015-04-231-19/+26
* | | | | | | | | Package and storage movement callbacks.Jeff Sharkey2015-04-233-55/+232
* | | | | | | | | Merge "CEC: Check port id for ARC status update on hotplug"Jinsuk Kim2015-04-241-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | CEC: Check port id for ARC status update on hotplugJinsuk Kim2015-04-241-1/+5
* | | | | | | | | | Merge "Clear binder identity before reaching into keyguard settings"Svetoslav2015-04-231-14/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Clear binder identity before reaching into keyguard settingsSvetoslav2015-04-231-14/+19
* | | | | | | | | | | Merge "Migrate lockscreen.disabled on upgrade"Adrian Roos2015-04-231-0/+29
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Migrate lockscreen.disabled on upgradeAdrian Roos2015-04-231-0/+29
* | | | | | | | | | | | Fix NPE when load() returns nulls.Craig Mautner2015-04-231-1/+1
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge "Revert some unnecessary changes in handling XML read"Svet Ganov2015-04-231-3/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert some unnecessary changes in handling XML readSvet Ganov2015-04-231-3/+4
* | | | | | | | | | | | Disallow data clearing of DeviceOwner.Craig Mautner2015-04-232-7/+37
* | | | | | | | | | | | Merge "Hopefully fix issue #20297662: Statusbar clock not updating"Dianne Hackborn2015-04-231-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Hopefully fix issue #20297662: Statusbar clock not updatingDianne Hackborn2015-04-231-1/+10
* | | | | | | | | | | | | Merge "Do not create oat directory for an app in ASEC container"Fyodor Kupolov2015-04-232-13/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Do not create oat directory for an app in ASEC containerFyodor Kupolov2015-04-232-13/+18
* | | | | | | | | | | | | | Merge "Maybe fix needing wifi permission to dump battery stats."Dianne Hackborn2015-04-231-5/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Maybe fix needing wifi permission to dump battery stats.Dianne Hackborn2015-04-221-5/+11
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Fixed bug with black background when exiting a wallpaper window."Wale Ogunwale2015-04-231-5/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed bug with black background when exiting a wallpaper window.Wale Ogunwale2015-04-221-5/+27
* | | | | | | | | | | | | | | Merge "Add and remove DeviceInitializer from whitelist"Craig Mautner2015-04-231-31/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add and remove DeviceInitializer from whitelistCraig Mautner2015-04-231-31/+67
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Fix bad crop on clip reveal animation"Craig Mautner2015-04-234-13/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix bad crop on clip reveal animationCraig Mautner2015-04-234-13/+20
* | | | | | | | | | | | | | | Merge "Enable system service to notify device owners about pending update"Rubin Xu2015-04-231-0/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Enable system service to notify device owners about pending updateRubin Xu2015-04-221-0/+40
* | | | | | | | | | | | | | | | Merge "Retain milestone timestamps of historical broadcast activity"Christopher Tate2015-04-231-17/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Retain milestone timestamps of historical broadcast activityChristopher Tate2015-04-221-17/+71
* | | | | | | | | | | | | | | | Merge "Don't limit fullscreen stack window size to parent window size"Wale Ogunwale2015-04-221-5/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Don't limit fullscreen stack window size to parent window sizeWale Ogunwale2015-04-221-5/+10
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Make read/write from/to XML persistent state more robust."Svet Ganov2015-04-221-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Make read/write from/to XML persistent state more robust.Svet Ganov2015-04-221-4/+8