Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
487,282 Commits 3 Branches 0 Tags
44013fc17cb2940a2ac2a34a95bc8a32c15b7d7e
Commit Graph

487282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mayank Garg
44013fc17c Merge "Added more events to user switch journey" into rvc-dev am: 6a468598f0 am: eca0ff9e29 
Change-Id: Ie65fc4cf9f249cee96fc51f23c212b75053c7915
 2020-05-21 09:01:32 +00:00
Mayank Garg
eca0ff9e29 Merge "Added more events to user switch journey" into rvc-dev am: 6a468598f0 
Change-Id: I4a9f84f08bdbd9fc6fc26fcea0713a0ef0b71313
 2020-05-21 08:40:14 +00:00
Mayank Garg
6a468598f0 Merge "Added more events to user switch journey" into rvc-dev 2020-05-21 08:22:01 +00:00
Chalard Jean
4401e112ee Merge "Address nit from aosp/1301317" into rvc-dev am: 4f94389c6d am: 3677549c74 
Change-Id: I5707daba5ddb0f7abdcd5c08588ab27e1770c35a
 2020-05-21 07:20:03 +00:00
Chalard Jean
a8caf45e3b Merge "Fix a bug where VPNs start out suspended on cellular" into rvc-dev am: 9941ef7930 am: 673b20e133 
Change-Id: Ie46cf8d1a3678ae9c7a92ae44abba16e56abd9ba
 2020-05-21 07:19:50 +00:00
Chalard Jean
1a18d48352 Merge "Fix a bug where a spurious capabilities callback is sent." into rvc-dev am: acdacbfe65 am: 7918495d6b 
Change-Id: I0fac45413097134d99371319394a0e6a9b27e94a
 2020-05-21 07:19:36 +00:00
Chalard Jean
3677549c74 Merge "Address nit from aosp/1301317" into rvc-dev am: 4f94389c6d 
Change-Id: I719006d1f3452a51303999dad5805ae0271ffddf
 2020-05-21 07:04:43 +00:00
Chalard Jean
673b20e133 Merge "Fix a bug where VPNs start out suspended on cellular" into rvc-dev am: 9941ef7930 
Change-Id: If3e0353505e89ffb4b6ae2fe49e11639f20e293e
 2020-05-21 07:03:51 +00:00
Chalard Jean
7918495d6b Merge "Fix a bug where a spurious capabilities callback is sent." into rvc-dev am: acdacbfe65 
Change-Id: I47f8f49d7e51ebaec68e7ad678f55fd0087847c7
 2020-05-21 07:02:49 +00:00
Goven Liu
45e58d2379 Revert "[Wi-Fi] Add proto fields for Openroaming network." am: b74db23313 am: b93a6c55fe 
Change-Id: I46949c2c09dc029528b7fd9a783dc36be2ca1280
 2020-05-21 06:50:25 +00:00
Chalard Jean
4f94389c6d Merge "Address nit from aosp/1301317" into rvc-dev 2020-05-21 06:44:30 +00:00
Chalard Jean
9941ef7930 Merge "Fix a bug where VPNs start out suspended on cellular" into rvc-dev 2020-05-21 06:43:56 +00:00
Chalard Jean
acdacbfe65 Merge "Fix a bug where a spurious capabilities callback is sent." into rvc-dev 2020-05-21 06:43:43 +00:00
Goven Liu
b93a6c55fe Revert "[Wi-Fi] Add proto fields for Openroaming network." am: b74db23313 
Change-Id: I5337cbd103bd7c15f35c8e266d56135df9d05f01
 2020-05-21 06:27:26 +00:00
Goven Liu
b74db23313 Revert "[Wi-Fi] Add proto fields for Openroaming network." 
This reverts commit d64e9452e4.

Reason for revert:
Those two metrics are added for Openroaming service, but they can not be used finally, so remove them.

Bug: 146669261
Test: No, just remove proto fields.
Change-Id: I601927c443b13a5d2d52e60ad4c910204156a102
 2020-05-21 05:51:09 +00:00
Treehugger Robot
cbb1fd0a7b Address nit from aosp/1301317 
Test: atest ConnectivityServiceTest#testVpnSetUnderlyingNetworks
Bug: 150570873
Original-Change: https://android-review.googlesource.com/1307374
Merged-In: If5e5439b22f05e08a293fd83da4d54f6a4363ca5
Change-Id: If5e5439b22f05e08a293fd83da4d54f6a4363ca5
 2020-05-21 05:12:41 +00:00
Chalard Jean
8e53c79556 Fix a bug where VPNs start out suspended on cellular 
As NetworkAgent is in a transition where all agents need
to include the NOT_SUSPENDED capability as part of their
migration to the system API, ConnectivityService adds it
forcefully to all agents that don't have the CELLULAR
transport. This doesn't include VPNs when VPNs have some
cellular network as their underlying network.

The best way to solve this is to make sure the VPN
capabilities reflect those of the underlying networks as
far as the NOT_SUSPENDED capability is concerned. This
is how they work for other similar capabilities.

This also happens to contain a drive-by fix for an issue
with a spurious capabilities callback is triggered when
a VPN connects and it has any underlying network (which
means almost always, because it will take the default
network if it doesn't declare any). Fixing this was
necessary to have a cogent test of this issue, but it
could be moved to another patch or it could stay unfixed
with some minor ajustment to the tests if judged too
dangerous to include in R at this point.

Test: New tests in this patch. Also manually tested with
      tcpdump as described in b/150570873.
Bug: 150570873
Original-Change: https://android-review.googlesource.com/1301317
Merged-In: I3e4ff990c0d4825b21c7679be29a482a2d1324ec
Change-Id: I3e4ff990c0d4825b21c7679be29a482a2d1324ec
 2020-05-21 05:10:37 +00:00
Chalard Jean
fe5e23f8a4 Fix a bug where a spurious capabilities callback is sent. 
When a VPN connects and it has any underlying network (which
means almost always, because it will take the default network
if it doesn't declare any), it has default capabilities and
will only take the capabilities of its underlying network
as part of an update happening after making the network
available but before the rematch can take place. This in turn
causes the capabilities callback sent as part of the rematch
to be spuriously sent.

Test: FrameworksNetTests. Also tested together with a
      followup that adds tests with drive-by coverage for this.
Bug: 150570873
Original-Change: https://android-review.googlesource.com/1305393
Merged-In: Id7d8bba486bada1a7ba5b0f152d2aa02e407f249
Change-Id: Id7d8bba486bada1a7ba5b0f152d2aa02e407f249
 2020-05-21 05:09:15 +00:00
TreeHugger Robot
c7dc5795ed Merge "Null-check the dragged-out bubble." into rvc-dev am: 92d678d8ad am: 87e02a263b 
Change-Id: Iecc3a09f3f15bc04c5d19ae88717f720eeff3fd6
 2020-05-21 04:10:03 +00:00
TreeHugger Robot
b1eb72b140 Merge "Remove temp READ_PHONE_STATE fix" into rvc-dev am: 1b9895eb46 am: e0b3613213 
Change-Id: Ic21cd83b64380c273fc93ccf9cd67b9d3e3d61f0
 2020-05-21 04:09:56 +00:00
TreeHugger Robot
87e02a263b Merge "Null-check the dragged-out bubble." into rvc-dev am: 92d678d8ad 
Change-Id: Ic6368c61eb7e47140c7d5a0b2f89b217c6797fff
 2020-05-21 03:54:05 +00:00
TreeHugger Robot
e0b3613213 Merge "Remove temp READ_PHONE_STATE fix" into rvc-dev am: 1b9895eb46 
Change-Id: Icd9fa28fe5d28c12e0628f9ff5f9e84183ee7d8e
 2020-05-21 03:53:47 +00:00
TreeHugger Robot
92d678d8ad Merge "Null-check the dragged-out bubble." into rvc-dev 2020-05-21 03:52:31 +00:00
TreeHugger Robot
1b9895eb46 Merge "Remove temp READ_PHONE_STATE fix" into rvc-dev 2020-05-21 03:35:36 +00:00
Hongwei Wang
703a67d3a8 Merge "Ignores entering PiP animation on seamless rotation" into rvc-dev am: 047a550900 am: a82f228bbb 
Change-Id: I15c50fe33332cddb77eea68e06592995c496fbcd
 2020-05-21 03:23:09 +00:00
TreeHugger Robot
65ab110841 Merge "Add SystemPartitionParseTest to postsubmit" into rvc-dev am: 8ced9207cc am: df54e71bb0 
Change-Id: Iea926710f735577bc738f01a4d9332bfcba75e5a
 2020-05-21 03:22:56 +00:00
Jaewan Kim
889993b143 Keep media sessions for stopping user until the stopping is completed am: f281109786 am: c3d57f029b am: 9cee90b7b8 
Change-Id: I8f00501ca9a4f2587f3bc10b95f6153f8162164c
 2020-05-21 03:22:38 +00:00
Hongwei Wang
a82f228bbb Merge "Ignores entering PiP animation on seamless rotation" into rvc-dev am: 047a550900 
Change-Id: I107e3ca6803ae9e5fdfb261aa12a8354f15b2fb0
 2020-05-21 03:16:49 +00:00
TreeHugger Robot
df54e71bb0 Merge "Add SystemPartitionParseTest to postsubmit" into rvc-dev am: 8ced9207cc 
Change-Id: Ifa920df50a777ffb0b34f75c6b5d27a37421ae98
 2020-05-21 03:15:56 +00:00
Hongwei Wang
047a550900 Merge "Ignores entering PiP animation on seamless rotation" into rvc-dev 2020-05-21 03:12:56 +00:00
TreeHugger Robot
8ced9207cc Merge "Add SystemPartitionParseTest to postsubmit" into rvc-dev 2020-05-21 03:12:31 +00:00
Jaewan Kim
9cee90b7b8 Keep media sessions for stopping user until the stopping is completed am: f281109786 am: c3d57f029b 
Change-Id: I110c70af2425bfe770dcb01fda01fc0d4e2aff39
 2020-05-21 03:10:01 +00:00
Jaewan Kim
c3d57f029b Keep media sessions for stopping user until the stopping is completed am: f281109786 
Change-Id: I7bd5edbb0046fa47e0090211c78045a2a67d08a9
 2020-05-21 02:55:15 +00:00
Joshua Tsuji
7db91c32aa Null-check the dragged-out bubble. 
Test: atest SystemUITests
Fixes: 157163804
Change-Id: Ib47130d61875fc86dfbb723d6c595bc3767ee132
 2020-05-20 22:28:59 -04:00
TreeHugger Robot
c44abca1e4 Merge "Prevent conflicting animations from starting." into rvc-dev am: e63ef53db5 am: 9214f548dd 
Change-Id: I1934d834e3b499f9bf02e55b2245fdc5584394af
 2020-05-21 02:22:56 +00:00
TreeHugger Robot
10d8dafcbb Merge "Prevent NPE in PulseExpansionHandler" into rvc-dev am: 2b24206ecd am: 210e5aa99e 
Change-Id: I4b313b8bfcea79b7703b826b0dc7b9bed527cba1
 2020-05-21 02:22:36 +00:00
TreeHugger Robot
9214f548dd Merge "Prevent conflicting animations from starting." into rvc-dev am: e63ef53db5 
Change-Id: I4741d43703249da2e482e03d3ecea22942b76f3f
 2020-05-21 02:05:44 +00:00
TreeHugger Robot
e63ef53db5 Merge "Prevent conflicting animations from starting." into rvc-dev 2020-05-21 02:03:23 +00:00
TreeHugger Robot
210e5aa99e Merge "Prevent NPE in PulseExpansionHandler" into rvc-dev am: 2b24206ecd 
Change-Id: I60a01ec5e152dbda60c11bbd6e00cb2beabfb7cf
 2020-05-21 02:00:12 +00:00
TreeHugger Robot
2b24206ecd Merge "Prevent NPE in PulseExpansionHandler" into rvc-dev 2020-05-21 01:57:11 +00:00
Wale Ogunwale
5be7d41691 Merge "Revert "Avoid wm<->am deadlock when checking uri permission"" into rvc-dev am: 6b937bab20 am: 4c21fd60c6 
Change-Id: Iebb45178434f1f814a0487a38554816fb47a4845
 2020-05-21 01:54:18 +00:00
TreeHugger Robot
f73a4ca828 Merge "Add tests for AtomicFile compatibility behaviors." into rvc-dev am: 6b98402100 am: 9746c711c1 
Change-Id: I88cd1cc856121a4838aa1ec627d37277f904a1ae
 2020-05-21 01:54:09 +00:00
Matt Casey
034dee709d Merge "Ensure screenshot edit action gets permissions for current user" into rvc-dev am: fe3df2ad27 am: c8e7451d2c 
Change-Id: Ibf636a68862fca81bf02116b08e96ae5c5bfff56
 2020-05-21 01:53:58 +00:00
Wale Ogunwale
4c21fd60c6 Merge "Revert "Avoid wm<->am deadlock when checking uri permission"" into rvc-dev am: 6b937bab20 
Change-Id: I12d314156644392bafcaba2a8b37aa1e3f572a69
 2020-05-21 01:47:23 +00:00
Wale Ogunwale
6b937bab20 Merge "Revert "Avoid wm<->am deadlock when checking uri permission"" into rvc-dev 2020-05-21 01:45:08 +00:00
TreeHugger Robot
9746c711c1 Merge "Add tests for AtomicFile compatibility behaviors." into rvc-dev am: 6b98402100 
Change-Id: I24157ed89c99093d91a1e3a7e3d5412e14dd6011
 2020-05-21 01:43:55 +00:00
Matt Casey
c8e7451d2c Merge "Ensure screenshot edit action gets permissions for current user" into rvc-dev am: fe3df2ad27 
Change-Id: If81acc0f66ba8c0bcef3a7c4f33dc639f9bb297d
 2020-05-21 01:42:59 +00:00
TreeHugger Robot
6b98402100 Merge "Add tests for AtomicFile compatibility behaviors." into rvc-dev 2020-05-21 01:36:58 +00:00
Sudheer Shanka
6b6cc81bd9 Merge "Update queryBlobsForUser() impl to handle special user ids." into rvc-dev am: 69a37e8e1a am: 9c9715e343 
Change-Id: I08c89288750a53ed932b330ba011ae6de713f688
 2020-05-21 01:23:18 +00:00
Matt Casey
fe3df2ad27 Merge "Ensure screenshot edit action gets permissions for current user" into rvc-dev 2020-05-21 01:22:15 +00:00