summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add IRadioResponse/Indication 1.3 and Emergency Function HAL"android-o-mr1-iot-release-1.0.4Shuo Qian2018-09-055-0/+231
|\
| * Add IRadioResponse/Indication 1.3 and Emergency Function HALsqian2018-09-045-0/+231
* | Merge "Correct the comments for radio hal types"Youming Ye2018-09-059-11/+135
|\ \
| * | Correct the comments for radio hal typesYouming Ye2018-09-049-11/+135
* | | Merge "Fix KM VTS tests for Strongbox implementations"Treehugger Robot2018-09-042-45/+51
|\ \ \ | |/ / |/| |
| * | Fix KM VTS tests for Strongbox implementationsBaranidharan Muthukumaran2018-08-282-45/+51
* | | Merge "Camera: support torch control on external camera"Treehugger Robot2018-08-302-3/+4
|\ \ \
| * | | Camera: support torch control on external cameraYin-Chia Yeh2018-08-282-3/+4
| |/ /
* | | Merge "Camera: Allow 3% ISO tolerance during ISO burst VTS" into pie-vts-devEmilian Peev2018-08-301-1/+3
|\ \ \
| * \ \ Merge "Camera: Allow 3% ISO tolerance during ISO burst VTS" into pie-vts-devTreehugger Robot2018-08-301-1/+3
| |\ \ \
| | * | | Camera: Allow 3% ISO tolerance during ISO burst VTSEmilian Peev2018-08-291-1/+3
* | | | | Merge "Allow getCapturePosition to return 0 frames for unprepared streams" in...Kevin Rocard2018-08-301-4/+9
|\| | | |
| * | | | Merge "Allow getCapturePosition to return 0 frames for unprepared streams" in...Treehugger Robot2018-08-301-4/+9
| |\ \ \ \
| | * | | | Allow getCapturePosition to return 0 frames for unprepared streamsKevin Rocard2018-08-291-4/+9
| | |/ / /
* | | | | Merge "Set the floor value of time estimate as 2017 Jan 01 00:00:00 GMT" into...Yu-Han Yang2018-08-291-1/+1
|\| | | |
| * | | | Merge "Set the floor value of time estimate as 2017 Jan 01 00:00:00 GMT" into...Treehugger Robot2018-08-291-1/+1
| |\ \ \ \
| | * | | | Set the floor value of time estimate as 2017 Jan 01 00:00:00 GMTYu-Han Yang2018-08-291-1/+1
| | |/ / /
* | | | | Merge "[ConfigStore] Clarify hasHDRDisplay spec."Treehugger Robot2018-08-292-3/+9
|\ \ \ \ \
| * | | | | [ConfigStore] Clarify hasHDRDisplay spec.Peiyong Lin2018-08-222-3/+9
| | |_|/ / | |/| | |
* | | | | [automerger skipped] Merge "Fix setAllowedCarrier" into pie-vts-devsqian2018-08-290-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Fix setAllowedCarrier" into pie-vts-devTreehugger Robot2018-08-291-20/+30
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix setAllowedCarriersqian2018-08-281-20/+30
* | | | | [automerger skipped] Merge "Change ImportWrappedKeyTest back to SHA1" into pi...Shawn Willden2018-08-290-0/+0
|\| | | |
| * | | | Merge "Change ImportWrappedKeyTest back to SHA1" into pie-vts-devTreehugger Robot2018-08-291-8/+8
| |\ \ \ \
| | * | | | Change ImportWrappedKeyTest back to SHA1Shawn Willden2018-08-281-8/+8
* | | | | | [automerger skipped] Merge "Require keymaster4 attestations to contain the ri...Shawn Willden2018-08-290-0/+0
|\| | | | |
| * | | | | Merge "Require keymaster4 attestations to contain the right version." into pi...Treehugger Robot2018-08-291-1/+1
| |\| | | |
| | * | | | Require keymaster4 attestations to contain the right version.Shawn Willden2018-08-281-1/+1
* | | | | | [automerger skipped] Merge "keymaster: skip SHA2 digest tests for strongbox" ...nagendra modadugu2018-08-290-0/+0
|\| | | | |
| * | | | | Merge "keymaster: skip SHA2 digest tests for strongbox" into pie-vts-devTreehugger Robot2018-08-291-31/+49
| |\| | | |
| | * | | | keymaster: skip SHA2 digest tests for strongboxnagendra modadugu2018-08-281-31/+49
* | | | | | [automerger skipped] Merge changes Ic41afbd0,Ibe264d08 into pie-vts-devnagendra modadugu2018-08-290-0/+0
|\| | | | |
| * | | | | Merge changes Ic41afbd0,Ibe264d08 into pie-vts-devTreehugger Robot2018-08-295-35/+63
| |\| | | |
| | * | | | keymaster: spec does not require that update produce outputnagendra modadugu2018-08-281-3/+4
| | * | | | Fix attestation test.Shawn Willden2018-08-285-32/+59
* | | | | | Merge "Fixing Keymaster documentation." into pie-vts-devEran Messeri2018-08-291-1/+1
|\| | | | |
| * | | | | Merge "Fixing Keymaster documentation." into pie-vts-devTreehugger Robot2018-08-291-1/+1
| |\| | | |
| | * | | | Fixing Keymaster documentation.Eran Messeri2018-08-281-1/+1
* | | | | | [automerger skipped] Allow general errors for getImsiForApp().Amit Mahajan2018-08-280-0/+0
|\| | | | |
| * | | | | Allow general errors for getImsiForApp().Amit Mahajan2018-08-281-1/+2
| | |/ / / | |/| | |
* | | | | [automerger skipped] Merge "Loose startNetworkScan cases" into pie-vts-devsqian2018-08-280-0/+0
|\| | | |
| * | | | Merge "Loose startNetworkScan cases" into pie-vts-devTreehugger Robot2018-08-281-7/+16
| |\ \ \ \
| | * | | | Loose startNetworkScan casessqian2018-08-281-7/+16
* | | | | | [automerger skipped] Merge "Fix missed refactor of serial" into pie-vts-devsqian2018-08-280-0/+0
|\| | | | |
| * | | | | Merge "Fix missed refactor of serial" into pie-vts-devTreehugger Robot2018-08-281-4/+4
| |\| | | |
| | * | | | Fix missed refactor of serialsqian2018-08-281-4/+4
* | | | | | [automerger skipped] Merge "Allow NOT_SUPPORTED for setLinkCapacityReportingC...Amit Mahajan2018-08-280-0/+0
|\| | | | |
| * | | | | Merge "Allow NOT_SUPPORTED for setLinkCapacityReportingCriteria on GERAN." in...Treehugger Robot2018-08-281-4/+18
| |\| | | |
| | * | | | Allow NOT_SUPPORTED for setLinkCapacityReportingCriteria on GERAN.Amit Mahajan2018-08-281-4/+18
* | | | | | [automerger skipped] Merge "Allow REQUEST_NOT_SUPPORTED as an error for start...Amit Mahajan2018-08-280-0/+0
|\| | | | |