summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am c8dce896: Merge "Fix not to show a log with empty default ime"Elliott Hughes2014-10-301-1/+5
|\
| * Merge "Fix not to show a log with empty default ime"Elliott Hughes2014-10-301-1/+5
| |\
| | * Fix not to show a log with empty default imeHyejin Kim2014-10-301-1/+5
* | | resolved conflicts for merge of 3c8cf51f into stage-aosp-masterAndreas Gampe2014-10-282-67/+21
|\ \ \ | |/ /
| * | Stop using apache http to download Gps XTRA data.Narayan Kamath2014-10-242-69/+24
| |/
| * Doesn't re-sort app windows when move task to toptingna_sung2014-10-221-0/+1
| * Avoid to skip app window due to un-assigned sending to bottom state while app...tingna_sung2014-10-222-0/+12
| * Clean up unused parameter warnings.Dan Albert2014-10-162-47/+41
| * Fix log call output format error. (DO NOT MERGE)Chih-Hung Hsieh2014-10-152-2/+2
* | am 5d604181: Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-devKristian Monsen2014-10-171-0/+1
|\ \
| * \ Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-devKristian Monsen2014-10-171-0/+1
| |\ \
| | * | Let TYPE_ANNOUNCEMENT be sent from any windowKristian Monsen2014-10-171-0/+1
* | | | am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." int...Svetoslav2014-10-172-44/+1
|\ \ \ \ | |/ / /
| * | | Accessibility no longer overrides strong encryption.Svetoslav2014-10-172-44/+1
* | | | am a865bb5d: Merge "Use the correct method to check if device is encrypted" i...Amith Yamasani2014-10-171-3/+8
|\ \ \ \ | |/ / /
| * | | Use the correct method to check if device is encryptedAmith Yamasani2014-10-171-3/+8
* | | | am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" ...Jim Miller2014-10-171-1/+3
|\ \ \ \ | |/ / /
| * | | Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-devJim Miller2014-10-171-1/+3
| |\ \ \ | | |/ / | |/| |
| | * | Fix getStorageEncryptionStatus() in DevicePolicyManagerJim Miller2014-10-151-1/+3
* | | | am 040d89bb: Merge "Eliminate race condition around backup completion + resum...Christopher Tate2014-10-161-1/+4
|\ \ \ \ | |/ / /
| * | | Eliminate race condition around backup completion + resumptionChristopher Tate2014-10-161-1/+4
* | | | am b22552c3: Merge "Send accessibility events with no window." into lmp-devSvet Ganov2014-10-161-1/+3
|\ \ \ \ | |/ / /
| * | | Send accessibility events with no window.Svet Ganov2014-10-161-1/+3
* | | | am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewal...Lorenzo Colitti2014-10-161-0/+10
|\ \ \ \ | |/ / /
| * | | Merge "Allow root and system to bypass the always-on VPN firewall rules" into...Lorenzo Colitti2014-10-161-0/+10
| |\ \ \
| | * | | Allow root and system to bypass the always-on VPN firewall rulesLorenzo Colitti2014-10-161-0/+10
* | | | | am 917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad...Lorenzo Colitti2014-10-161-2/+10
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Don't make lockdown VPN source firewall rules over-broad." into lmp-devLorenzo Colitti2014-10-161-2/+10
| |\ \ \ \ | | |/ / /
| | * | | Don't make lockdown VPN source firewall rules over-broad.Lorenzo Colitti2014-10-161-2/+10
* | | | | am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker...Lorenzo Colitti2014-10-162-8/+26
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-devLorenzo Colitti2014-10-162-8/+26
| |\ \ \ \ | | |/ / /
| | * | | Propagate network state changes to the LockdownVpnTracker.Lorenzo Colitti2014-10-162-8/+26
* | | | | am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-devChristopher Tate2014-10-161-0/+15
|\ \ \ \ \ | |/ / / /
| * | | | Fix spurious restore session timeoutsChristopher Tate2014-10-161-0/+15
* | | | | am 5d460b88: Merge "Remove unnecessary logging." into lmp-devCraig Mautner2014-10-151-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Remove unnecessary logging." into lmp-devCraig Mautner2014-10-151-1/+0
| |\ \ \ \
| | * | | | Remove unnecessary logging.Craig Mautner2014-10-151-1/+0
* | | | | | am e5279105: Merge "Move desired task to top if not already there." into lmp-devCraig Mautner2014-10-151-4/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Move desired task to top if not already there." into lmp-devCraig Mautner2014-10-151-4/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | Move desired task to top if not already there.Craig Mautner2014-10-151-4/+9
* | | | | | am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/...John Spurlock2014-10-151-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." in...John Spurlock2014-10-151-1/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Leave zen when apps set ringer-mode = non-silent (normal/vibrate).John Spurlock2014-10-151-1/+1
| | | |/ / | | |/| |
* | | | | am c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-devRoboErik2014-10-151-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Don't call size on a null metadata" into lmp-devRoboErik2014-10-151-1/+3
| |\ \ \ \
| | * | | | Don't call size on a null metadataRoboErik2014-10-151-1/+3
* | | | | | am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-devAmith Yamasani2014-10-151-4/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix admin policies in managed profiles" into lmp-devAmith Yamasani2014-10-151-4/+0
| |\ \ \ \ \
| | * | | | | Fix admin policies in managed profilesAmith Yamasani2014-10-151-4/+0
* | | | | | | am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp...Jeff Sharkey2014-10-151-4/+5
|\ \ \ \ \ \ \ | |/ / / / / /