Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
478,588 Commits 3 Branches 0 Tags
f7b5773fb84f1c08bd615c75bc64dd7156536063
Commit Graph

478588 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hongwei Wang
f7b5773fb8 Merge "Update bounds on shelf/ime adjustment during transition" into rvc-dev am: 5b8c53ff00 am: cb91e28099 
Change-Id: I0d271bd2906ec4d1007c508b65df5d8424e35047
 2020-04-07 05:37:46 +00:00
Hongwei Wang
cb91e28099 Merge "Update bounds on shelf/ime adjustment during transition" into rvc-dev am: 5b8c53ff00 
Change-Id: Ib4bbe90b3ad97eaa98d8b92548f8db36f37ed2c3
 2020-04-07 05:22:50 +00:00
Paul Hu
53ee61ff48 Merge "Fix EntitlementManager issues" into rvc-dev am: bc60cca4dd am: 739254c33b 
Change-Id: I424f85c3f8b9ac13f49d23211c90c2814d6a91ec
 2020-04-07 05:07:41 +00:00
Lorenzo Colitti
2ea294e68c Merge "Add a test for static IPv4 address tethering configuration." into rvc-dev am: 1b93b670a1 am: 45d1fc3816 
Change-Id: I8978973e7a3a1d538672b43a5d7d113c06f58aa0
 2020-04-07 05:07:20 +00:00
Lorenzo Colitti
67516cf431 Merge "Use CompletableFuture instead of a latch." into rvc-dev am: 4b6961d78d am: bf3a1dd65a 
Change-Id: Ie1c39b329f69c1328aceb6e77b0410f7b1200c33
 2020-04-07 05:06:43 +00:00
Hongwei Wang
5b8c53ff00 Merge "Update bounds on shelf/ime adjustment during transition" into rvc-dev 2020-04-07 05:06:19 +00:00
Paul Hu
739254c33b Merge "Fix EntitlementManager issues" into rvc-dev am: bc60cca4dd 
Change-Id: I4604c7e324757e738fdaec2d2d9f0b351086a7e1
 2020-04-07 04:49:37 +00:00
Lorenzo Colitti
45d1fc3816 Merge "Add a test for static IPv4 address tethering configuration." into rvc-dev am: 1b93b670a1 
Change-Id: I6d7542d085d15969007862aa60ac3b723ca109db
 2020-04-07 04:49:06 +00:00
Lorenzo Colitti
bf3a1dd65a Merge "Use CompletableFuture instead of a latch." into rvc-dev am: 4b6961d78d 
Change-Id: Ic8a461333b73f9bcc51480aea0387a4573e2e2ef
 2020-04-07 04:48:39 +00:00
Paul Hu
bc60cca4dd Merge "Fix EntitlementManager issues" into rvc-dev 2020-04-07 04:37:30 +00:00
Lorenzo Colitti
1b93b670a1 Merge "Add a test for static IPv4 address tethering configuration." into rvc-dev 2020-04-07 04:30:58 +00:00
Lorenzo Colitti
4b6961d78d Merge "Use CompletableFuture instead of a latch." into rvc-dev 2020-04-07 04:30:33 +00:00
Pardis Beikzadeh
a773ba3804 Merge "Post cancelAsUser to mHandler." into rvc-dev am: ecfe611854 am: 981987beef 
Change-Id: Ia9585208b6d6d904fdb57a4543a06ca6174e303c
 2020-04-07 04:19:20 +00:00
TreeHugger Robot
2279b65e25 Merge "Store conversation requirement in a setting" into rvc-dev am: 5eb9c8fada am: fb7f470b5a 
Change-Id: I0d930ef7cb570c731299cb0f7017223f3be577b1
 2020-04-07 04:08:54 +00:00
Pardis Beikzadeh
981987beef Merge "Post cancelAsUser to mHandler." into rvc-dev am: ecfe611854 
Change-Id: I998eb0775fff0b601282f3150e2d34b73270656a
 2020-04-07 04:08:15 +00:00
TreeHugger Robot
fb7f470b5a Merge "Store conversation requirement in a setting" into rvc-dev am: 5eb9c8fada 
Change-Id: Id0498070faaf38a0ed59fc2859908d21cfaddc90
 2020-04-07 03:57:57 +00:00
Pardis Beikzadeh
ecfe611854 Merge "Post cancelAsUser to mHandler." into rvc-dev 2020-04-07 03:48:33 +00:00
TreeHugger Robot
5eb9c8fada Merge "Store conversation requirement in a setting" into rvc-dev 2020-04-07 03:47:02 +00:00
Xiao Ma
98c72a1b58 Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." into rvc-dev am: b145e47021 am: 3d6e44f9b1 
Change-Id: If0db8accecae9c159ed66649ad95d782f52e6713
 2020-04-07 03:37:52 +00:00
Xiao Ma
3d6e44f9b1 Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." into rvc-dev am: b145e47021 
Change-Id: I197cbda4504cbc6ca3148dec6c31f58b995ed752
 2020-04-07 03:17:41 +00:00
Xiao Ma
b145e47021 Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." into rvc-dev 2020-04-07 02:50:41 +00:00
Jing Ji
1e4a17b5d6 Merge "Fix NullPointerException in ActiveService" into rvc-dev am: b7b84697fd am: 1f70f0a5c6 
Change-Id: I73a7e4e63a1745ff8e331d9c9a20ce06258f051d
 2020-04-07 02:37:09 +00:00
Lorenzo Colitti
36371a5d13 Merge "Refactor the Nat464Xlat function for simplicity." into rvc-dev am: 3a6906b9e3 am: ffca079c19 
Change-Id: I8c6349accaf9090d56cd42c162596ad00f5b2a4b
 2020-04-07 02:37:02 +00:00
Lorenzo Colitti
a785b84ff1 Merge "Migrate to TetherOffloadRuleParcel in IpServer" into rvc-dev am: b99fc7b343 am: a4d0c1cf4a 
Change-Id: I4e2cf2fae4d4eeec153ee81ab6f944ee28ab55b8
 2020-04-07 02:36:42 +00:00
TreeHugger Robot
6dbd25d688 Merge "Also load fs-verity cert from /system/etc/security/fsverity/" into rvc-dev am: 05a0fc26e0 am: 79f0d091ed 
Change-Id: Iadd6c85b13613d2bc680ff80ba9fed0a3e67b483
 2020-04-07 02:36:13 +00:00
Lorenzo Colitti
7ec6f17b2b Add a test for static IPv4 address tethering configuration. 
Bug: 150644681
Test: test-only change
Merged-In: I8f4a99da2351fdb5467f561a9732b14a8ebf674b
Change-Id: I8f4a99da2351fdb5467f561a9732b14a8ebf674b
 2020-04-07 02:21:00 +00:00
Lorenzo Colitti
76602035b9 Use CompletableFuture instead of a latch. 
Addresses review comments on aosp/1260100.

Bug: 150644681
Test: test-only change
Merged-In: Ia73ba8a121a3744a5e36795d2d2bff2f099c1394
Change-Id: Ia73ba8a121a3744a5e36795d2d2bff2f099c1394
 2020-04-07 02:20:35 +00:00
Jing Ji
1f70f0a5c6 Merge "Fix NullPointerException in ActiveService" into rvc-dev am: b7b84697fd 
Change-Id: Ie007c401f04fc118ae1f8d63bade1cf68a62250f
 2020-04-07 02:16:42 +00:00
Lorenzo Colitti
ffca079c19 Merge "Refactor the Nat464Xlat function for simplicity." into rvc-dev am: 3a6906b9e3 
Change-Id: Ia2e41676b853300ba6c8e72827dc9ab2b58da58c
 2020-04-07 02:16:23 +00:00
Lorenzo Colitti
a4d0c1cf4a Merge "Migrate to TetherOffloadRuleParcel in IpServer" into rvc-dev am: b99fc7b343 
Change-Id: I288bd790c246de068c6143932fa312a7662a24f7
 2020-04-07 02:15:42 +00:00
Jing Ji
b7b84697fd Merge "Fix NullPointerException in ActiveService" into rvc-dev 2020-04-07 02:15:28 +00:00
TreeHugger Robot
79f0d091ed Merge "Also load fs-verity cert from /system/etc/security/fsverity/" into rvc-dev am: 05a0fc26e0 
Change-Id: I555437aca791cdf4de3672b0cc6a109f289f4cac
 2020-04-07 02:14:51 +00:00
Lorenzo Colitti
3a6906b9e3 Merge "Refactor the Nat464Xlat function for simplicity." into rvc-dev 2020-04-07 02:13:33 +00:00
Lorenzo Colitti
b99fc7b343 Merge "Migrate to TetherOffloadRuleParcel in IpServer" into rvc-dev 2020-04-07 02:12:50 +00:00
TreeHugger Robot
05a0fc26e0 Merge "Also load fs-verity cert from /system/etc/security/fsverity/" into rvc-dev 2020-04-07 02:00:07 +00:00
Vinit Nayak
28fae013c6 Merge "Avoid visibility change on navBar view if null" into rvc-dev am: 8694188f71 am: 0460b4c16d 
Change-Id: I4264b02eaf5a4243f7ced076768644e08e37bde1
 2020-04-07 01:31:20 +00:00
Selim Cinek
a8c1782565 Merge changes I76df6529,I99594ae9 into rvc-dev am: 35910cacaa am: c9e647b261 
Change-Id: I0237dbc29c646634ef40da9271fd47b66c0b1b36
 2020-04-07 01:31:12 +00:00
Jackal Guo
bee2dd0808 Merge "Use hand-written counted loop for ArrayList" into rvc-dev am: 7e4cf533ac am: 13a7ceb9ec 
Change-Id: I59e52cbacaba03909ff9cb695c986064729c4d64
 2020-04-07 01:31:03 +00:00
TreeHugger Robot
d5c0806cc0 Merge "Rename vts-core to vts" into rvc-dev am: e8931d06dd am: 0a3f6eac80 
Change-Id: Ic2d0156691e55d7589beb7980353b7f37150a0ba
 2020-04-07 01:30:33 +00:00
Vinit Nayak
0460b4c16d Merge "Avoid visibility change on navBar view if null" into rvc-dev am: 8694188f71 
Change-Id: I6006434daf1fea894a8590f7fd21129b0d9ed225
 2020-04-07 01:30:26 +00:00
TreeHugger Robot
3549fc3f5e Merge "Fix tasks not resized in split-screen" into rvc-dev am: 55ace3ebb3 am: bf58390af6 
Change-Id: I38d16fa375b7375d83e172ed5185fb4eb7f45406
 2020-04-07 01:30:25 +00:00
Eric Laurent
e479d94159 Merge "SoundTriggerHelper: improve in call behavior" into rvc-dev am: b6c403b091 am: 0185e6d638 
Change-Id: I7851430f12e78ff90baa40f3bcddb44b9fbe40e7
 2020-04-07 01:30:19 +00:00
Selim Cinek
c9e647b261 Merge changes I76df6529,I99594ae9 into rvc-dev am: 35910cacaa 
Change-Id: Ie65662f27922c729a7b63c8dfd8065142bc6b80e
 2020-04-07 01:29:57 +00:00
Eric Laurent
988c72fb77 Merge "AudioSystem: add annotation on API used by CTS media" into rvc-dev am: 3b13f5ef87 am: 72633a60b9 
Change-Id: I5eceae4b02187281ce098cf6284254219304d915
 2020-04-07 01:29:55 +00:00
Jackal Guo
13a7ceb9ec Merge "Use hand-written counted loop for ArrayList" into rvc-dev am: 7e4cf533ac 
Change-Id: I30d06123e0db0fa13f1db53ad377166e18bba9cf
 2020-04-07 01:29:05 +00:00
Xiao Ma
3eab4929c9 Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic. 
Bug: 130741856
Test: atest TetheringTests
Merged-In: I66614fbf67fba1e7dab0b8a2d41bc30a726e4f38
Change-Id: I66614fbf67fba1e7dab0b8a2d41bc30a726e4f38
 2020-04-07 01:26:50 +00:00
Vinit Nayak
8694188f71 Merge "Avoid visibility change on navBar view if null" into rvc-dev 2020-04-07 01:25:23 +00:00
Paul Hu
0409ac518c Fix EntitlementManager issues 
1. Add TETHERING_ETHERNET to vaild downstream type. So starting
   ethernet tethering will do entitlement check as well.
2. Ignore request with invalid downstream type on
   handleRequestLatestTetheringEntitlementValue()

Bug: 152828758
Bug: 152828142
Test: atests TetheringTests CtsTetheringTest

Change-Id: Id0cb59cc4681f5ffbde7be54de05a05e46f0ffb8
Merged-In: Id0cb59cc4681f5ffbde7be54de05a05e46f0ffb8
(cherry picked from commit c502e050fd)
 2020-04-07 01:23:49 +00:00
Selim Cinek
35910cacaa Merge changes I76df6529,I99594ae9 into rvc-dev 
* changes:
  Fixed the heads up layout of conversations
  Fixed an issue where the conversation title was showing doubled
 2020-04-07 01:22:04 +00:00
Jackal Guo
7e4cf533ac Merge "Use hand-written counted loop for ArrayList" into rvc-dev 2020-04-07 01:19:39 +00:00