summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am a7a65ee4: Merge "Allow non system to set perm policy flags - needed by the...Svetoslav Ganov2015-07-291-2/+0
|\
| * Merge "Allow non system to set perm policy flags - needed by the installer" i...Svetoslav Ganov2015-07-291-2/+0
| |\
| | * Allow non system to set perm policy flags - needed by the installerSvet Ganov2015-07-291-2/+0
* | | am 120a86ac: Merge "Do not reset runtime permissions on upgrade" into mnc-devSvetoslav Ganov2015-07-291-1/+1
|\ \ \ | |/ /
| * | Merge "Do not reset runtime permissions on upgrade" into mnc-devSvetoslav Ganov2015-07-291-1/+1
| |\ \
| | * | Do not reset runtime permissions on upgradeSvet Ganov2015-07-291-1/+1
| | |/
* | | am 64ac302f: Merge "Send a public broadcast when the device owner is set." in...Nicolas Prévot2015-07-291-0/+8
|\ \ \ | |/ /
| * | Merge "Send a public broadcast when the device owner is set." into mnc-devNicolas Prévot2015-07-291-0/+8
| |\ \
| | * | Send a public broadcast when the device owner is set.Nicolas Prevot2015-07-281-0/+8
* | | | resolved conflicts for merge of 30813942 to mnc-dr-devPaul Jensen2015-07-291-8/+4
|\ \ \ \ | |/ / /
| * | | Merge "Disable WiFi autojoin when user decides via "Stay connected?" dialog" ...Paul Jensen2015-07-291-8/+4
| |\ \ \
| | * | | Disable WiFi autojoin when user decides via "Stay connected?" dialogPaul Jensen2015-07-161-8/+4
* | | | | am b8040265: Merge "Give secondary users read-only physical cards." into mnc-devJeff Sharkey2015-07-291-6/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Give secondary users read-only physical cards." into mnc-devJeff Sharkey2015-07-291-6/+6
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Give secondary users read-only physical cards.Jeff Sharkey2015-07-281-6/+6
* | | | | am b310c894: Merge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc...Dianne Hackborn2015-07-291-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc-devDianne Hackborn2015-07-291-2/+2
| |\ \ \ \
| | * | | | Fix issue #22802691: APR: NPE in ActivityRecordDianne Hackborn2015-07-281-2/+2
* | | | | | am 5b009d52: Merge "Fix issue #22802617: APR: spurious wtf when restarting a ...Dianne Hackborn2015-07-291-1/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix issue #22802617: APR: spurious wtf when restarting a persistent pr...Dianne Hackborn2015-07-291-1/+4
| |\ \ \ \ \
| | * | | | | Fix issue #22802617: APR: spurious wtf when restarting a persistent processDianne Hackborn2015-07-281-1/+4
| | |/ / / /
* | | | | | am 0d210f63: Animation for touch, wake and unlockJorim Jaggi2015-07-284-8/+83
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Animation for touch, wake and unlockJorim Jaggi2015-07-284-8/+83
* | | | | | am 751a96a0: Merge "Don\'t redundantly call transport.finishRestore()" into m...Chris Tate2015-07-281-10/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Don't redundantly call transport.finishRestore()" into mnc-devChris Tate2015-07-281-10/+2
| |\ \ \ \ \
| | * | | | | Don't redundantly call transport.finishRestore()Christopher Tate2015-07-281-10/+2
| | |/ / / /
* | | | | | am f2c616ed: Merge "Partially revert package freezing" into mnc-devTodd Kennedy2015-07-281-29/+19
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Partially revert package freezing" into mnc-devTodd Kennedy2015-07-281-29/+19
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Partially revert package freezingTodd Kennedy2015-07-281-29/+19
* | | | | | am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in R...Dianne Hackborn2015-07-282-2/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Work on issue #21516866: Implement voice interaction in ResolverActivi...Dianne Hackborn2015-07-282-2/+4
| |\ \ \ \ \
| | * | | | | Work on issue #21516866: Implement voice interaction in ResolverActivityDianne Hackborn2015-07-282-2/+4
| | | |/ / / | | |/| | |
* | | | | | am 850dd690: Merge "Don\'t use screenshot if structure is disabled (1/2)" int...Jorim Jaggi2015-07-281-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Don't use screenshot if structure is disabled (1/2)" into mnc-devJorim Jaggi2015-07-281-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Don't use screenshot if structure is disabled (1/2)Jorim Jaggi2015-07-271-1/+1
* | | | | | am 60261137: Merge "BatteryStats: Compensate for accuracy issues when reporti...Adam Lesinski2015-07-281-1/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energ...Adam Lesinski2015-07-281-1/+3
| |\ \ \ \ \
| | * | | | | BatteryStats: Compensate for accuracy issues when reporting WiFi energy data ...Adam Lesinski2015-07-271-1/+3
* | | | | | | am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-devLorenzo Colitti2015-07-283-2/+88
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge changes I5c994de5,I6cb0dd84 into mnc-devLorenzo Colitti2015-07-283-2/+88
| |\ \ \ \ \ \
| | * | | | | | Add a test for public bugs 2111 and 2136.Lorenzo Colitti2015-07-271-1/+67
| | * | | | | | Always check off-link connectivity in NetworkDiagnostics.Lorenzo Colitti2015-07-272-1/+21
| | | |_|_|_|/ | | |/| | | |
* | | | | | | am 67a32c49: Merge "Added missing check for MANAGE_USERS" into mnc-devFyodor Kupolov2015-07-271-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Added missing check for MANAGE_USERS" into mnc-devFyodor Kupolov2015-07-271-0/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Added missing check for MANAGE_USERSFyodor Kupolov2015-07-271-0/+1
* | | | | | | am 2e606d7b: Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.Jeff Sharkey2015-07-271-8/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.Jeff Sharkey2015-07-271-8/+16
| | |_|/ / / | |/| | | |
* | | | | | am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into ...Adam Lesinski2015-07-271-19/+28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-devAdam Lesinski2015-07-271-19/+28
| |\ \ \ \ \
| | * | | | | BatteryStats: Prevent BatteryService from blockingAdam Lesinski2015-07-271-19/+28