Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
529,325 Commits 3 Branches 0 Tags
da4e5cb4a92b70f131914840b381ea2b1f92df09
Commit Graph

118800 Commits

Author SHA1 Message Date
Tiger Huang
da4e5cb4a9 Merge "Ensure the requested insets state is up to date" into rvc-dev am: b8ad491e6d am: 282a713b1a am: 29ea59f79c am: d76c953235 
Change-Id: Ibf4eff83cfb7fb39cfa3e3c970d3df23d3533a14
 2020-04-30 19:17:50 +00:00
Tiger Huang
29ea59f79c Merge "Ensure the requested insets state is up to date" into rvc-dev am: b8ad491e6d am: 282a713b1a 
Change-Id: I58dcab9f984b8998609b4ac6ada8b9a0f2a3e4f8
 2020-04-30 18:23:18 +00:00
Tiger Huang
282a713b1a Merge "Ensure the requested insets state is up to date" into rvc-dev am: b8ad491e6d 
Change-Id: I76a3e67aece7e28c3f410f11dad330591c2fe0ab
 2020-04-30 18:10:56 +00:00
Tiger Huang
b8ad491e6d Merge "Ensure the requested insets state is up to date" into rvc-dev 2020-04-30 17:56:41 +00:00
Benedict Wong
449bd6fe45 Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev 2020-04-30 17:29:29 +00:00
Adrian Roos
425c1b1cda Merge "WindowInsetsController: make available after addView" into rvc-dev am: 1cd9750aa4 am: 1e672d552d am: 9978475dff am: 6c4ac4b209 
Change-Id: If46368ef7e938ea5d03845a38be78ded294e57af
 2020-04-30 16:34:17 +00:00
Rambo Wang
c73045e82c Merge "Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier" am: b86d989fce am: 9544c8a20b am: e4acbd16d6 am: 1bf141dae1 am: 5f5cdb27ec 
Change-Id: Ib6de8d56a91183fa20ab840cd17ac14dd825cc9a
 2020-04-30 16:33:53 +00:00
Tiger Huang
173480f29d Ensure the requested insets state is up to date 
Previously, the client won't send the modified insets state to window
manager if the dispatched state and the local state are the same. The
following case can make the requested insets state at the server side
stale:

1. Window A requests an insets source to be invisible while having
   the control.
2. Window A loses the control.
3. The new control target requests the insets source to be visible.
4. Window A receives the new insets state from server.
5. Window A also requests the insets source to be visible while not
   having the control.
6. Window A gain the control.
7. Window A won't send the new requested state (visible) to window
   manager because the local state and the dispatched state are the
   same.
8. Window manager keeps assuming that window A is requesting the insets
   source to be invisible which is incorrect.

This CL stores what insets state is sent to server, and updates/sends
the state to server while gaining the control if the requested state is
changed.

Fix: 146964271
Test: Manual.
Change-Id: I6ee533d9316c769faef539bfb980197c351ee8d1
 2020-05-01 00:27:38 +08:00
Adrian Roos
9978475dff Merge "WindowInsetsController: make available after addView" into rvc-dev am: 1cd9750aa4 am: 1e672d552d 
Change-Id: I12f2f65bcfbadb3be31765c8f0ab7d8123a3c142
 2020-04-30 15:52:56 +00:00
Rambo Wang
1bf141dae1 Merge "Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier" am: b86d989fce am: 9544c8a20b am: e4acbd16d6 
Change-Id: I670338e67a45d90593aedad2ddf3a0983d4c1b26
 2020-04-30 15:52:41 +00:00
Adrian Roos
1e672d552d Merge "WindowInsetsController: make available after addView" into rvc-dev am: 1cd9750aa4 
Change-Id: I8e3988fa96be501caf3447dc258ed80cdb1339e7
 2020-04-30 15:52:26 +00:00
Adrian Roos
1cd9750aa4 Merge "WindowInsetsController: make available after addView" into rvc-dev 2020-04-30 15:40:26 +00:00
Rambo Wang
e4acbd16d6 Merge "Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier" am: b86d989fce am: 9544c8a20b 
Change-Id: I80164890061f1f3ba6900e6f5e73e3bc6fc04b5c
 2020-04-30 15:31:31 +00:00
Rambo Wang
9544c8a20b Merge "Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier" am: b86d989fce 
Change-Id: Ia4f99dcf6c86a356c1490b6500dd5e5016ff7257
 2020-04-30 15:19:24 +00:00
Rambo Wang
b86d989fce Merge "Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier" 2020-04-30 15:07:18 +00:00
Rambo Wang
6fc5438dfd Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier 
MatchAllNetworkSpecifier is a subclass of NetworkSpecifer. The method
satisfiedBy should be renamed to canBeSatisfiedBy together with other
subclass of NetworkSpecifer in b/152238712.

Add annotation @Overide for the method to make sure it will not get
ignored when refactor in the future.

Bug: 154956584
Test: atest android.net.MatchAllNetworkSpecifierTest
Change-Id: Ibe32fd50fae43aa635c1c0dad66eaea82011c8b7
 2020-04-30 15:06:35 +00:00
Nikita Ioffe
7da20e5319 Merge "Teach PackageManager.getApplicationInfo about MATCH_APEX" into rvc-dev am: 0b7f9b9b99 am: e3462ee2bb am: a04d184c7a am: 449e20c588 
Change-Id: Iaf6de710af7c6f1049294da952ff0dd7056ed756
 2020-04-30 11:44:12 +00:00
Nikita Ioffe
a04d184c7a Merge "Teach PackageManager.getApplicationInfo about MATCH_APEX" into rvc-dev am: 0b7f9b9b99 am: e3462ee2bb 
Change-Id: I76b18888c1c5f1f19f5289ebea37c591df1a419b
 2020-04-30 11:17:42 +00:00
Nikita Ioffe
e3462ee2bb Merge "Teach PackageManager.getApplicationInfo about MATCH_APEX" into rvc-dev am: 0b7f9b9b99 
Change-Id: I92bccfe2f9357f3717140a83cdb98b89016331df
 2020-04-30 10:57:51 +00:00
Nikita Ioffe
7b6ddb59be Merge "Teach PackageManager.getApplicationInfo about MATCH_APEX" into rvc-dev am: 0b7f9b9b99 
Change-Id: I2b88363a6fb3ed79a5889a041e473c8e8b6d20c2
 2020-04-30 10:57:37 +00:00
Nikita Ioffe
0b7f9b9b99 Merge "Teach PackageManager.getApplicationInfo about MATCH_APEX" into rvc-dev 2020-04-30 10:49:37 +00:00
Chris Li
851e8f969e Merge "Allow Overlay Display to take display flags" into rvc-dev am: 07fbb63884 am: 4eb1cc95db am: d50a2c92f6 am: ff781bb21c 
Change-Id: Ic37fdc56178e1ab5bf93ed5289dc4b10111bf699
 2020-04-30 08:34:30 +00:00
Chris Li
d50a2c92f6 Merge "Allow Overlay Display to take display flags" into rvc-dev am: 07fbb63884 am: 4eb1cc95db 
Change-Id: If31fda957d1e57cf28512ca95df0691f27fe10be
 2020-04-30 07:46:24 +00:00
Chris Li
40bd430c84 Merge "Allow Overlay Display to take display flags" into rvc-dev am: 07fbb63884 
Change-Id: I5c1b261b6a48d042ad6d1b31954ee2eb599cff76
 2020-04-30 07:24:16 +00:00
Chris Li
4eb1cc95db Merge "Allow Overlay Display to take display flags" into rvc-dev am: 07fbb63884 
Change-Id: Id2955e98047e717ed6fc26ca952e1e52a99ba1c1
 2020-04-30 07:24:10 +00:00
Chris Li
07fbb63884 Merge "Allow Overlay Display to take display flags" into rvc-dev 2020-04-30 07:12:12 +00:00
Benedict Wong
4fab295446 Add filtering for IPsec algorithms in IKEv2 VPNs 
This commit adds support for validating and filtering IPsec algorithms.
Without a public API exposing IKEv2 algorithms (and their respective
public APIs), the allowedAlgorithms can only filter the proposals for
IPsec (Child) SA algorithms.

Additionally, this removes the HMAC_SHA1 from the IKE SA's integrity
algorithm proposals due to insecurity

Bug: 153701879
Test: FrameworksNetTests passing, new tests added
Change-Id: I7e61a1612692db275b751330af5bacbf86836a8c
Merged-In: I7e61a1612692db275b751330af5bacbf86836a8c
(cherry picked from commit 94e1c08a9a)
 2020-04-29 23:05:35 -07:00
Automerger Merge Worker
d20fa451a4 Merge "Merge "Report caption insets change when layout" into rvc-dev am: 9f804f7593 am: e1c304a615" into rvc-d1-dev-plus-aosp am: 5973fc34ac am: 226b24f842 
Change-Id: If995ba2c5bf2e0ada02902f037bc92a0a044e3c7
 2020-04-30 05:35:06 +00:00
Yunfan Chen
846f8acda4 Merge "Report caption insets change when layout" into rvc-dev am: 9f804f7593 am: e1c304a615 
Change-Id: If709132abfdf5bae121c612ecbe39a8f4ec84475
 2020-04-30 05:04:51 +00:00
Yunfan Chen
3e87b4d891 Merge "Report caption insets change when layout" into rvc-dev am: 9f804f7593 
Change-Id: If0cab89959f4f24d9f8cff1f0ea9c5835c7b4540
 2020-04-30 04:52:42 +00:00
Yunfan Chen
e1c304a615 Merge "Report caption insets change when layout" into rvc-dev am: 9f804f7593 
Change-Id: Ia8b4747c9ef657f7b8afb367807526ec7bd08024
 2020-04-30 04:52:34 +00:00
Yunfan Chen
9f804f7593 Merge "Report caption insets change when layout" into rvc-dev 2020-04-30 04:43:47 +00:00
TreeHugger Robot
9a65d1ceff Merge "Handle exceptions on attach" into rvc-dev am: d5a777965b am: a206357d45 am: c8621cce48 am: a6a1980501 
Change-Id: I14bc61583b15bac376bc3efbd993a6443b286ea6
 2020-04-30 01:48:10 +00:00
TreeHugger Robot
c8621cce48 Merge "Handle exceptions on attach" into rvc-dev am: d5a777965b am: a206357d45 
Change-Id: Ie7997904bb8da85b4c3fd6a722e73a288803c10c
 2020-04-30 01:20:04 +00:00
TreeHugger Robot
a206357d45 Merge "Handle exceptions on attach" into rvc-dev am: d5a777965b 
Change-Id: Icbe7913740cd40e96ad82ccca0a873a6c2963328
 2020-04-30 01:17:59 +00:00
TreeHugger Robot
7faf00a5a3 Merge "Handle exceptions on attach" into rvc-dev am: d5a777965b 
Change-Id: Ie0e7879f27ca374816fc81774f972d452dbefef6
 2020-04-30 01:17:59 +00:00
TreeHugger Robot
d5a777965b Merge "Handle exceptions on attach" into rvc-dev 2020-04-30 01:12:51 +00:00
Darryl Johnson
f53cc215cf Merge "Add test to ensure virtual display orientation doesn't change when device rotates." into rvc-dev am: 77fae23490 am: f0a128ba2b am: 909c1f0431 am: 4489b29e65 
Change-Id: I9ca8632f7998acab4af843e661da30c5387eb883
 2020-04-30 00:46:59 +00:00
Chavi Weingarten
afab14ff95 Merge "Remove getLeash from WindowContainerToken" into rvc-dev am: 5a4a5682a2 am: e00fbbe6c4 am: ecccd3de1e am: 906d4d2c1f 
Change-Id: Ie01960a15f0134abc4e02a73ba5cf629d930ccd5
 2020-04-30 00:46:44 +00:00
Ryan Mitchell
16ef866bd2 Merge "Allow pre-R apps to test compressed ARSC error" into rvc-dev am: e3c40062e6 am: f40f3edd2f am: 9cc6606dd6 am: 3716684697 
Change-Id: I325d25f78ce687916b09c9d25f288fccdff970dc
 2020-04-30 00:46:32 +00:00
Jeff Sharkey
4cd89d7d40 Merge "Update more Parcelables to send Strings UTF-8." into rvc-dev am: 1eb3fcfb33 am: e9214abdf3 am: 16844ca4e0 am: 4581e4d59d 
Change-Id: I09c9c0251c909665eab4a676c85d28fad9d9b047
 2020-04-30 00:41:34 +00:00
Darryl Johnson
909c1f0431 Merge "Add test to ensure virtual display orientation doesn't change when device rotates." into rvc-dev am: 77fae23490 am: f0a128ba2b 
Change-Id: I828e46db28febd6342c7fa7b7aac3ffe0f8b1a4b
 2020-04-30 00:29:25 +00:00
Chavi Weingarten
ecccd3de1e Merge "Remove getLeash from WindowContainerToken" into rvc-dev am: 5a4a5682a2 am: e00fbbe6c4 
Change-Id: I6fafd649d35f3cf2f7d42eb4dbedbaec477f848a
 2020-04-30 00:29:17 +00:00
Ryan Mitchell
9cc6606dd6 Merge "Allow pre-R apps to test compressed ARSC error" into rvc-dev am: e3c40062e6 am: f40f3edd2f 
Change-Id: I465ad0558a16d13221053b9065e9321889487145
 2020-04-30 00:29:05 +00:00
Darryl Johnson
f0a128ba2b Merge "Add test to ensure virtual display orientation doesn't change when device rotates." into rvc-dev am: 77fae23490 
Change-Id: I5522d81c0606c96ba7010909e43a6b8a4cc327b1
 2020-04-30 00:27:40 +00:00
Jeff Sharkey
16844ca4e0 Merge "Update more Parcelables to send Strings UTF-8." into rvc-dev am: 1eb3fcfb33 am: e9214abdf3 
Change-Id: Ib3930c412d0b3b0ddaf7c05ca51feed036dc337e
 2020-04-30 00:27:10 +00:00
Darryl Johnson
76b64efa38 Merge "Add test to ensure virtual display orientation doesn't change when device rotates." into rvc-dev am: 77fae23490 
Change-Id: Ib14fb09532f4256d7ab5a2b8934b8af7b67d5ac8
 2020-04-30 00:18:27 +00:00
Darryl Johnson
77fae23490 Merge "Add test to ensure virtual display orientation doesn't change when device rotates." into rvc-dev 2020-04-30 00:18:02 +00:00
Chavi Weingarten
6eae26b96f Merge "Remove getLeash from WindowContainerToken" into rvc-dev am: 5a4a5682a2 
Change-Id: If2e767cc167267de8f2297194419e297cba53621
 2020-04-30 00:18:00 +00:00
Chavi Weingarten
e00fbbe6c4 Merge "Remove getLeash from WindowContainerToken" into rvc-dev am: 5a4a5682a2 
Change-Id: If831151d84c02ce9e30fc194f8e0335a5674c738
 2020-04-30 00:17:32 +00:00