summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is...Amith Yamasani2014-10-171-3/+8
|\
| * 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 4142d9b0: am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePo...Jim Miller2014-10-171-1/+3
|\ \ \ | |/ /
| * | 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 61737d81: am 040d89bb: Merge "Eliminate race condition around backup compl...Christopher Tate2014-10-171-1/+4
|\ \ \ \ | |/ / /
| * | | 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
* | | | Merge "telephony re-registry error" into lmp-mr1-devxinhe2014-10-161-15/+16
|\ \ \ \
| * | | | telephony re-registry errorxinhe2014-10-161-15/+16
* | | | | am 76ed803f: Merge "Add system property config.disable_networktime to configu...Chenjie Luo2014-10-161-1/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Add system property config.disable_networktime to configure NetworkTimeUpdate...Chenjie Luo2014-10-161-1/+2
* | | | | am fe09db1e: Merge "Revert "Add system property config.disable_timeupdate to ...Chenjie Luo2014-10-161-3/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Revert "Add system property config.disable_timeupdate to configure Net...Chenjie Luo2014-10-161-3/+1
| |\ \ \ \
| | * | | | Revert "Add system property config.disable_timeupdate to configure NetworkTim...Chenjie Luo2014-10-161-3/+1
* | | | | | am 515f14d4: am b22552c3: Merge "Send accessibility events with no window." i...Svet Ganov2014-10-161-1/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 8fac6682: Merge "Add system property config.disable_timeupdate to configur...Chenjie Luo2014-10-161-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Add system property config.disable_timeupdate to configure NetworkTimeUpdateS...Chenjie Luo2014-10-161-1/+3
* | | | | am d04d6c91: am b7d85148: Merge "Allow root and system to bypass the always-o...Lorenzo Colitti2014-10-161-0/+10
|\ \ \ \ \ | |/ / / /
| * | | | 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 ffd73350: am 917c547b: Merge "Don\'t make lockdown VPN source firewall rul...Lorenzo Colitti2014-10-161-2/+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 24f9a26c: am 28dcf034: Merge "Propagate network state changes to the Lockd...Lorenzo Colitti2014-10-162-8/+26
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 ce39d25f: am 185fcadf: Merge "Fix spurious restore session timeouts" into ...Christopher Tate2014-10-161-0/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 d1a58c45: am 5d460b88: Merge "Remove unnecessary logging." into lmp-devCraig Mautner2014-10-161-1/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 87441860: am e5279105: Merge "Move desired task to top if not already ther...Craig Mautner2014-10-161-4/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 3d4aec1b: am b2344c81: Merge "Leave zen when apps set ringer-mode = non-si...John Spurlock2014-10-161-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 0dfd86e0: am c7be69f1: Merge "Don\'t call size on a null metadata" into lm...RoboErik2014-10-161-1/+3
|\ \ \ \ \ \ | |/ / / / /