summaryrefslogtreecommitdiff
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fixed a race contidion in StorageManagerService" am: 782ef476df am: c6...Zimuzo Ezeozue2020-12-011-0/+15
|\
| * Merge "Fixed a race contidion in StorageManagerService"Zimuzo Ezeozue2020-12-011-0/+15
| |\
| | * Fixed a race contidion in StorageManagerServiceOlof Axelsson2020-11-301-0/+15
* | | Merge "Revert "Revert "Keystore SPI: Initialize KeymasterDefs contants with A...Treehugger Robot2020-12-011-167/+258
|\| |
| * | Merge "Revert "Revert "Keystore SPI: Initialize KeymasterDefs contants with A...Treehugger Robot2020-12-011-167/+258
| |\ \
| | * | Revert "Revert "Keystore SPI: Initialize KeymasterDefs contants with AIDL gen...Janis Danisevskis2020-11-301-167/+258
* | | | Merge "Fix documentation of delay param in VibrationEffect.Composition" am: 0...Lais Andrade2020-12-011-2/+1
|\| | |
| * | | Merge "Fix documentation of delay param in VibrationEffect.Composition"Lais Andrade2020-11-301-2/+1
| |\ \ \
| | * | | Fix documentation of delay param in VibrationEffect.CompositionLais Andrade2020-11-301-2/+1
* | | | | Merge "Update link for Permissions samples in Javadoc" am: a7564ec175 am: fd9...Treehugger Robot2020-11-301-2/+2
|\| | | |
| * | | | Update link for Permissions samples in JavadocTiem Song2020-11-301-2/+2
| |/ / /
* | | | Merge "Revert "Keystore SPI: Initialize KeymasterDefs contants with AIDL gene...Louis Chang2020-11-301-258/+167
|\| | |
| * | | Merge "Revert "Keystore SPI: Initialize KeymasterDefs contants with AIDL gene...Louis Chang2020-11-301-258/+167
| |\| |
| | * | Revert "Keystore SPI: Initialize KeymasterDefs contants with AIDL generated e...Louis Chang2020-11-301-258/+167
* | | | Merge changes I982543cd,I41c3bf6c,Id3e5f6e1 am: 86d837daa8 am: e5334a1b25Lorenzo Colitti2020-11-301-7/+0
|\| | |
| * | | Migrate VPN to the public NetworkAgent API.Chalard Jean2020-11-301-7/+0
| * | | Merge changes from topic "networkagent-set-underlying-networks"Lorenzo Colitti2020-11-282-2/+47
| |\ \ \
* | \ \ \ Allow tests to create TRANSPORT_TEST|TRANSPORT_VPN networks. am: 45feed9b00 a...Lorenzo Colitti2020-11-281-1/+4
|\ \ \ \ \
| * \ \ \ \ Allow tests to create TRANSPORT_TEST|TRANSPORT_VPN networks. am: 45feed9b00Lorenzo Colitti2020-11-281-1/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Allow tests to create TRANSPORT_TEST|TRANSPORT_VPN networks.Lorenzo Colitti2020-11-271-1/+4
* | | | | | Move applying underlying caps from Vpn to ConnectivityService. am: d182c40d8c...Lorenzo Colitti2020-11-281-1/+43
|\| | | | |
| * | | | | Move applying underlying caps from Vpn to ConnectivityService. am: d182c40d8cLorenzo Colitti2020-11-281-1/+43
| |\| | | | | | |/ / / | |/| | |
| | * | | Move applying underlying caps from Vpn to ConnectivityService.Lorenzo Colitti2020-11-271-1/+43
* | | | | Merge "Keystore SPI: Initialize KeymasterDefs contants with AIDL generated en...Janis Danisevskis2020-11-271-167/+258
|\| | | |
| * | | | Merge "Keystore SPI: Initialize KeymasterDefs contants with AIDL generated en...Janis Danisevskis2020-11-271-167/+258
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * / Keystore SPI: Initialize KeymasterDefs contants with AIDL generated enumsJanis Danisevskis2020-11-231-167/+258
| | |/
* | | Merge "Add Null check for mView.findFocus() in ViewRootImpl" into rvc-qpr-dev...Ming-Shin Lu2020-11-261-2/+2
|\ \ \
| * | | Add Null check for mView.findFocus() in ViewRootImplMing-Shin Lu2020-11-261-2/+2
* | | | Merge "Makes the multi-touch prevention only works for editable TextView." in...TreeHugger Robot2020-11-261-4/+4
|\| | |
| * | | Merge "Makes the multi-touch prevention only works for editable TextView." in...TreeHugger Robot2020-11-261-4/+4
| |\ \ \
| | * | | Makes the multi-touch prevention only works for editable TextView.Shu Chen2020-10-231-4/+4
* | | | | Merge "ParcelableHolder shouldn't write anything for empty case" am: 97c2606b...Treehugger Robot2020-11-261-5/+15
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "ParcelableHolder shouldn't write anything for empty case"Treehugger Robot2020-11-261-5/+15
| |\ \ \ \
| | * | | | ParcelableHolder shouldn't write anything for empty caseJeongik Cha2020-11-241-5/+15
* | | | | | Merge "Make manual suggestions synchronous/return result" am: 08466f6151 am: ...Almaz Mingaleev2020-11-256-11/+18
|\| | | | |
| * | | | | Make manual suggestions synchronous/return resultNeil Fuller2020-11-256-11/+18
* | | | | | Merge "Expose getTx/RxBytes in TrafficStats" am: 6ef6648cd9 am: aca01cd0c1Junyu Lai2020-11-251-10/+50
|\| | | | |
| * | | | | Expose getTx/RxBytes in TrafficStatsjunyulai2020-11-241-10/+50
| | |_|_|/ | |/| | |
* | | | | Merge "Adds two missing Keymaster definitions." am: 6d7e4c43d6 am: faefa76349Bram Bonné2020-11-231-0/+2
|\| | | |
| * | | | Merge "Adds two missing Keymaster definitions."Bram Bonné2020-11-231-0/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Adds two missing Keymaster definitions.Bram Bonné2020-11-191-0/+2
* | | | | Allow only preloaded voice recognition services to blame calling apps. am: 19...Ahaan Ugale2020-11-211-9/+15
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Allow only preloaded voice recognition services to blame calling apps.Ahaan Ugale2020-11-211-9/+15
* | | | | Merge "Update UntaggedSocketViolation StrictMode message to reference Traffic...Treehugger Robot2020-11-211-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Update UntaggedSocketViolation StrictMode message to reference Traffic...Treehugger Robot2020-11-211-1/+1
| |\ \ \ \
| | * | | | Update UntaggedSocketViolation StrictMode message to reference TrafficStats.s...Alexander Zlatin2020-11-181-1/+1
| | | |/ / | | |/| |
* | | | | Merge changes from topic "move_BSCH" am: 1b414d61b4 am: 2ea9048daa am: 7becf0...Chiachang Wang2020-11-201-330/+0
|\ \ \ \ \
| * | | | | Merge changes from topic "move_BSCH" am: 1b414d61b4 am: 2ea9048daaChiachang Wang2020-11-201-330/+0
| |\| | | |
| | * | | | Merge changes from topic "move_BSCH"Chiachang Wang2020-11-202-337/+1
| | |\ \ \ \
| | | * | | | Remove BasicShellCommandHandler from frameworks/baseChiachang Wang2020-11-191-330/+0