summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t h...Lorenzo Colitti2015-08-191-2/+1
|\
| * Merge "Don't mark NetworkRequests restricted when they don't have restricted ...Lorenzo Colitti2015-08-191-2/+1
| |\
| | * Don't mark NetworkRequests restricted when they don't have restricted capsPaul Jensen2015-08-191-2/+1
* | | am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-devAmith Yamasani2015-08-191-1/+2
|\ \ \ | |/ /
| * | Merge "Fix crashes when removing work profile" into mnc-devAmith Yamasani2015-08-191-1/+2
| |\ \
| | * | Fix crashes when removing work profileAmith Yamasani2015-08-181-1/+2
* | | | am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batt...Dianne Hackborn2015-08-191-1/+3
|\ \ \ \ | |/ / /
| * | | Fix issue #23326715: Clarify --checkin/-c options in batterystatsDianne Hackborn2015-08-181-1/+3
| | |/ | |/|
* | | Merge "Launched camera in the correct user." into mnc-dr-devZhentao Sun2015-08-191-1/+2
|\ \ \
| * | | Launched camera in the correct user.Zhentao Sun2015-08-181-1/+2
* | | | am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-devAdam Lesinski2015-08-191-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Change default cellular activity timeout to 10" into mnc-devAdam Lesinski2015-08-181-1/+1
| |\ \ \
| | * | | Change default cellular activity timeout to 10Adam Lesinski2015-08-181-1/+1
* | | | | Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr...Jim Miller2015-08-181-0/+10
|\ \ \ \ \
| * | | | | Reset fingerprint lockout timer when strong auth is used.Jim Miller2015-08-181-0/+10
* | | | | | resolved conflicts for merge of 448216e7 to mnc-dr-devJim Miller2015-08-181-6/+0
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge "Revert "Disable fingerprint when remotely reset by DPM"" into mnc-devJim Miller2015-08-181-6/+0
| |\ \ \ \
| | * | | | Revert "Disable fingerprint when remotely reset by DPM"Jim Miller2015-08-171-6/+0
* | | | | | Merge "Use init to write usb typec props." into mnc-dr-devTim Kilbourn2015-08-181-12/+42
|\ \ \ \ \ \
| * | | | | | Use init to write usb typec props.Tim Kilbourn2015-08-141-12/+42
* | | | | | | am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running User...Dianne Hackborn2015-08-181-0/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Fix issue #23270878: NPE in UsageStatsService while running UserManagementTestDianne Hackborn2015-08-181-0/+3
* | | | | | | am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-devFilip Gruszczynski2015-08-181-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Clear old clip rect when creating new surface." into mnc-devFilip Gruszczynski2015-08-181-1/+2
| |\ \ \ \ \ \
| | * | | | | | Clear old clip rect when creating new surface.Filip Gruszczynski2015-08-171-1/+2
| | | |_|_|_|/ | | |/| | | |
* | | | | | | am 12b9c2d6: Merge "Fix issue #23214751: Get a GPS fix before going in to doz...Dianne Hackborn2015-08-182-50/+244
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix issue #23214751: Get a GPS fix before going in to doze" into mnc-devDianne Hackborn2015-08-182-50/+244
| |\ \ \ \ \ \
| | * | | | | | Fix issue #23214751: Get a GPS fix before going in to dozeDianne Hackborn2015-08-172-50/+244
* | | | | | | | am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fail...Chris Tate2015-08-181-2/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-devChris Tate2015-08-181-2/+6
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Clean up properly if outcall for doRestoreFinished() failsChristopher Tate2015-08-171-2/+6
| | |/ / / / /
* | | | | | | Merge "Not allowing empty fingerprint names anymore" into mnc-dr-devSelim Cinek2015-08-171-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Not allowing empty fingerprint names anymoreSelim Cinek2015-08-171-0/+5
* | | | | | | | am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to rece...Junda Liu2015-08-171-0/+8
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge "Grant SMS carrier provisioning app the permission to receive SMS." int...Junda Liu2015-08-171-0/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Grant SMS carrier provisioning app the permission to receive SMS.Junda Liu2015-08-141-0/+8
| | | |_|_|_|/ / | | |/| | | | |
* | | | | | | | am a3fd27ad: Merge "Check component permissions like \'exported\' before assi...Chris Tate2015-08-171-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Check component permissions like 'exported' before assigned permissionsChristopher Tate2015-08-171-4/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge "instrument fingerprint service" into mnc-dr-devChris Wren2015-08-171-5/+52
|\ \ \ \ \ \ \
| * | | | | | | instrument fingerprint serviceChris Wren2015-08-141-5/+52
* | | | | | | | Merge "Show usb charging notification when in host mode" into mnc-dr-devJason Monk2015-08-171-1/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Show usb charging notification when in host modeJason Monk2015-08-121-1/+27
* | | | | | | | | am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {U...Dianne Hackborn2015-08-161-0/+22
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...Dianne Hackborn2015-08-141-0/+22
* | | | | | | | | am 7df411d0: Merge "Clear calling identity before getting the current user." ...Julia Reynolds2015-08-141-14/+20
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | / / / / | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Merge "Clear calling identity before getting the current user." into mnc-devJulia Reynolds2015-08-141-14/+20
| |\ \ \ \ \ \ \
| | * | | | | | | Clear calling identity before getting the current user.Julia Reynolds2015-08-131-14/+20
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-devChris Tate2015-08-141-2/+31
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Make "Ask every time" actually work that way" into mnc-devChris Tate2015-08-141-2/+31
| |\ \ \ \ \ \ \
| | * | | | | | | Make "Ask every time" actually work that wayChristopher Tate2015-08-131-2/+31