Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
503,518 Commits 3 Branches 0 Tags
2073ff0008e496b2bfc4e21a96ffd4107dc5c00c
Commit Graph

503518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
2073ff0008 Merge "Merge "Allow bubbles for HUNs that were "snoozed" via the gesture" into rvc-dev am: 892d50baf2 am: e093563da4" into rvc-d1-dev-plus-aosp 2020-05-26 17:22:18 +00:00
Mady Mellor
dd2810a696 Merge "Allow bubbles for HUNs that were "snoozed" via the gesture" into rvc-dev am: 892d50baf2 am: e093563da4 
Change-Id: I358a6b52da164afc1482fee22eb6cf636bfb783f
 2020-05-26 17:22:06 +00:00
Mady Mellor
c8f8dc94da Merge "Allow bubbles for HUNs that were "snoozed" via the gesture" into rvc-dev am: 892d50baf2 am: 1b74883540 
Change-Id: I84289ad68bce33ac2c32dca3b208df66918fe9c1
 2020-05-26 17:21:54 +00:00
Mady Mellor
e093563da4 Merge "Allow bubbles for HUNs that were "snoozed" via the gesture" into rvc-dev am: 892d50baf2 
Change-Id: I8047f400dfebb773b1c07158080146df9fcb1158
 2020-05-26 17:07:55 +00:00
Mady Mellor
1b74883540 Merge "Allow bubbles for HUNs that were "snoozed" via the gesture" into rvc-dev am: 892d50baf2 
Change-Id: Ie76bcfd46a0194c8e0e0a862c40c29b60f653725
 2020-05-26 17:07:55 +00:00
Mady Mellor
892d50baf2 Merge "Allow bubbles for HUNs that were "snoozed" via the gesture" into rvc-dev 2020-05-26 16:48:23 +00:00
Heemin Seog
d1649cc364 Merge "Add hseog@ to OWNERS" am: 7e66cb43f9 am: c268ce2f75 am: 9212c34b46 
Change-Id: I6c9675333bddc23eb37cb44e673b18bf69b6900c
 2020-05-26 16:39:48 +00:00
Michael Groover
22e61aa5e4 Merge "Address edge cases for signing certificate lineages in sharedUids" into rvc-dev am: 2046776127 am: a548a2ebce 
Change-Id: I2d7fe61d0e81a851821d9fb40f77a910be9a9a42
 2020-05-26 16:39:13 +00:00
Heemin Seog
9212c34b46 Merge "Add hseog@ to OWNERS" am: 7e66cb43f9 am: c268ce2f75 
Change-Id: Ib0cbee335d4dead661e22f8bf0465fd02011baec
 2020-05-26 16:27:07 +00:00
Michael Groover
a548a2ebce Merge "Address edge cases for signing certificate lineages in sharedUids" into rvc-dev am: 2046776127 
Change-Id: I500c6b25f855c6772bf7775f3995647cbecaa0f9
 2020-05-26 16:21:07 +00:00
TreeHugger Robot
e7d3dabcd0 Merge "Fixes NPE on null pkg" into rvc-dev am: 7b3b0611d3 am: 081a3237fa 
Change-Id: Iaeab3ad0dde82c1b54f8c9e34394046ef0a98b86
 2020-05-26 16:18:54 +00:00
Michael Groover
0a0ef10023 Merge "Address edge cases for signing certificate lineages in sharedUids" into rvc-dev am: 2046776127 am: 3cdc8fbdb2 
Change-Id: I1e94467d08e78fe0a9eb1b958b12846f6082f606
 2020-05-26 16:18:31 +00:00
TreeHugger Robot
d4c8b199b6 Merge "Fixes NPE on null pkg" into rvc-dev am: 7b3b0611d3 am: 05a3919da8 
Change-Id: I6a8ee1f2b292758db836dd1bb3280586c0cfcc35
 2020-05-26 16:18:15 +00:00
Mike Digman
6ff21be1e2 Merge "Use current label for Sharing Shortcuts in Sharesheet" into rvc-dev am: 9a4ec16d7f am: 8fa8ea8b55 
Change-Id: Icffcdc89adf5b4140dc68512ef1477701b540df6
 2020-05-26 16:17:49 +00:00
Mike Digman
e996ed90fa Merge "Use current label for Sharing Shortcuts in Sharesheet" into rvc-dev am: 9a4ec16d7f am: 41a950e82c 
Change-Id: I48ebfd8c7cd37d429194e59900003f8db8c71a9e
 2020-05-26 16:17:34 +00:00
Michael Groover
3cdc8fbdb2 Merge "Address edge cases for signing certificate lineages in sharedUids" into rvc-dev am: 2046776127 
Change-Id: If65b24c62ca4ae868d15bbf30aff5f5bbc4b235f
 2020-05-26 16:11:10 +00:00
Heemin Seog
c268ce2f75 Merge "Add hseog@ to OWNERS" am: 7e66cb43f9 
Change-Id: I79f8ea1e80b37dace8f38037a84435ff19e402f6
 2020-05-26 16:10:03 +00:00
Michael Groover
2046776127 Merge "Address edge cases for signing certificate lineages in sharedUids" into rvc-dev 2020-05-26 16:07:57 +00:00
TreeHugger Robot
05a3919da8 Merge "Fixes NPE on null pkg" into rvc-dev am: 7b3b0611d3 
Change-Id: I9f8079d0ad2ebc5dcd19f601c6aeeb2b60f2e282
 2020-05-26 16:07:23 +00:00
TreeHugger Robot
081a3237fa Merge "Fixes NPE on null pkg" into rvc-dev am: 7b3b0611d3 
Change-Id: I487475650af4b25444d184cd7e863b341e7b836f
 2020-05-26 16:05:37 +00:00
Mike Digman
8fa8ea8b55 Merge "Use current label for Sharing Shortcuts in Sharesheet" into rvc-dev am: 9a4ec16d7f 
Change-Id: I57ed05e511cfc5717888fca64a66a75b4c114c83
 2020-05-26 16:01:48 +00:00
Mike Digman
41a950e82c Merge "Use current label for Sharing Shortcuts in Sharesheet" into rvc-dev am: 9a4ec16d7f 
Change-Id: Ib3e124e131c2959225a42413965080ccda94d1bb
 2020-05-26 16:01:46 +00:00
TreeHugger Robot
7b3b0611d3 Merge "Fixes NPE on null pkg" into rvc-dev 2020-05-26 15:59:58 +00:00
Heemin Seog
7e66cb43f9 Merge "Add hseog@ to OWNERS" 2020-05-26 15:52:25 +00:00
Automerger Merge Worker
94cec8d284 Merge "Merge "Fix size compat bounds in close-to-square display" into rvc-dev am: 1961a740b4 am: 10e8e721ed" into rvc-d1-dev-plus-aosp 2020-05-26 15:49:49 +00:00
TreeHugger Robot
5f304ab475 Merge "Fix size compat bounds in close-to-square display" into rvc-dev am: 1961a740b4 am: 10e8e721ed 
Change-Id: I02e9eb2fcddc86116b042bd69ac2036303599fea
 2020-05-26 15:47:52 +00:00
Mike Digman
9a4ec16d7f Merge "Use current label for Sharing Shortcuts in Sharesheet" into rvc-dev 2020-05-26 15:46:44 +00:00
TreeHugger Robot
1e682f1e32 Merge "Fix size compat bounds in close-to-square display" into rvc-dev am: 1961a740b4 am: c33c8aaee7 
Change-Id: I7a10cf81010954d33c45ba490620b4573dbc8f46
 2020-05-26 15:45:19 +00:00
TreeHugger Robot
c33c8aaee7 Merge "Fix size compat bounds in close-to-square display" into rvc-dev am: 1961a740b4 
Change-Id: I277ebf4608d0f65567c4d76d110353108c8d6106
 2020-05-26 15:32:38 +00:00
TreeHugger Robot
10e8e721ed Merge "Fix size compat bounds in close-to-square display" into rvc-dev am: 1961a740b4 
Change-Id: I56850dc00d1706ba3c11ea84a80673df6797543c
 2020-05-26 15:32:36 +00:00
TreeHugger Robot
1961a740b4 Merge "Fix size compat bounds in close-to-square display" into rvc-dev 2020-05-26 15:14:10 +00:00
Josh Tsuji
d26cf4adf1 Merge "Add configurable physics settings for UX refinement." into rvc-dev am: 54b0b93ff7 am: 2be65d5ded 
Change-Id: I4efde2b3e181977e6a3b06cf6ff8f33de38f2643
 2020-05-26 14:44:40 +00:00
Automerger Merge Worker
dadab63a42 Merge "[automerger skipped] Inform the DNS resolver when it needs to do DNS64 synthesis. am: 7f7171c6a1 -s ours am: cff1640951 -s ours" into rvc-d1-dev-plus-aosp 2020-05-26 14:44:36 +00:00
Lorenzo Colitti
517f4769c6 [automerger skipped] Inform the DNS resolver when it needs to do DNS64 synthesis. am: 7f7171c6a1 -s ours am: cff1640951 -s ours 
am skip reason: Change-Id If8ad2d30712a6df3e207c8d3e8a129705242191e with SHA-1 82bb897e87 is in history

Change-Id: I555fef9a552f36a1f7570ee8819d8aa2620c52d7
 2020-05-26 14:44:22 +00:00
Josh Tsuji
89657aba19 Merge "Add configurable physics settings for UX refinement." into rvc-dev am: 54b0b93ff7 am: 112f93da34 
Change-Id: I2f4330da9a3e621bc0dc49d1cd57385f1c922f6e
 2020-05-26 14:44:19 +00:00
Lorenzo Colitti
a80f1b767e [automerger skipped] Inform the DNS resolver when it needs to do DNS64 synthesis. am: 7f7171c6a1 am: 9afb44fa28 -s ours 
am skip reason: Change-Id If8ad2d30712a6df3e207c8d3e8a129705242191e with SHA-1 82bb897e87 is in history

Change-Id: Ide2ea957cb63654eb54bed449ab04e250f5ca904
 2020-05-26 14:44:07 +00:00
Josh Tsuji
2be65d5ded Merge "Add configurable physics settings for UX refinement." into rvc-dev am: 54b0b93ff7 
Change-Id: I1b9e267f84d1541294ec22c17dc358c6f661d969
 2020-05-26 14:29:42 +00:00
Lorenzo Colitti
cff1640951 [automerger skipped] Inform the DNS resolver when it needs to do DNS64 synthesis. am: 7f7171c6a1 -s ours 
am skip reason: Change-Id If8ad2d30712a6df3e207c8d3e8a129705242191e with SHA-1 82bb897e87 is in history

Change-Id: Iec52ca510f3c066abbd96636c595acb89828c29a
 2020-05-26 14:29:28 +00:00
Josh Tsuji
112f93da34 Merge "Add configurable physics settings for UX refinement." into rvc-dev am: 54b0b93ff7 
Change-Id: Id32cedf4fb4d6443beb65abf4fc73734399e338c
 2020-05-26 14:29:22 +00:00
Lorenzo Colitti
9afb44fa28 Inform the DNS resolver when it needs to do DNS64 synthesis. am: 7f7171c6a1 
Change-Id: Ic418b02d68985a6a8ea22d845ad57349468b4dcd
 2020-05-26 14:29:13 +00:00
Josh Tsuji
54b0b93ff7 Merge "Add configurable physics settings for UX refinement." into rvc-dev 2020-05-26 14:20:24 +00:00
Patrick Baumann
0bc18b37ac Fixes NPE on null pkg 
This change moves unprotected access of a setting's pkg field to take
place after an existing null check.

Test: atest AppEnumerationTests
Fixes: 157298411
Change-Id: I49c0cb0d08dd09cabd271cf195a8eff71a98083c
 2020-05-26 06:28:33 -07:00
Lorenzo Colitti
c02f887698 [automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: fbf205a380 -s ours am: d30611e229 -s ours 
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 fbf205a380 is in history

Change-Id: Icb5f3ccb42469f84770a9a4b8a1dc990c67a9376
 2020-05-26 13:10:39 +00:00
Lorenzo Colitti
bcf6db2cea [automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: fbf205a380 am: bc7b68512d -s ours 
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 4afb82b32e is in history

Change-Id: Ie0482e523786bc79a414bf1bb38195365c3bef42
 2020-05-26 13:10:23 +00:00
Lorenzo Colitti
d30611e229 [automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: fbf205a380 -s ours 
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 4afb82b32e is in history

Change-Id: I3e050057ba6ac95d789ed7f34f390bec586d84b7
 2020-05-26 12:58:24 +00:00
Lorenzo Colitti
bc7b68512d Test that if an RA sets the same prefix as DNS, nothing happens. am: fbf205a380 
Change-Id: I171ff7fd8140028dc4a4e7df5cc4663b8ad696e7
 2020-05-26 12:58:22 +00:00
Matt Pietal
ce22f75349 Merge "Controls UI - Multi-user switch updates" into rvc-dev am: 7604a184d9 am: ea4e36df74 
Change-Id: Ifc53c77b6613b4242c4f48520e594b1f07878df9
 2020-05-26 12:11:29 +00:00
Matt Pietal
bd21eb91be Merge "Controls UI - Multi-user switch updates" into rvc-dev am: 7604a184d9 am: 44f3e98c7b 
Change-Id: Id8dfa91e07e67df7b904b52347ffefcfd8bff16e
 2020-05-26 12:11:09 +00:00
Lorenzo Colitti
7f7171c6a1 Inform the DNS resolver when it needs to do DNS64 synthesis. 
This is only necessary when learning the NAT64 prefix from the
RA, because if the NAT64 prefix is learned from DNS, the DNS
resolver already knows the prefix and automatically enables
DNS64 synthesis.

The DNS resolver needs to be informed of the prefix any time
clat is running on a prefix learned from an RA. This is simple to
implement: just set the prefix when starting clat if prefix
discovery is not running, and clear the prefix when stopping clat
if prefix discovery was not running. This ensures that the prefix
is cleared iff it was set.

Bug: 156914456
Test: new unit test coverage
Original-Change: https://android-review.googlesource.com/1315578
Merged-In: If8ad2d30712a6df3e207c8d3e8a129705242191e
Change-Id: If8ad2d30712a6df3e207c8d3e8a129705242191e
 2020-05-26 11:52:35 +00:00
Matt Pietal
ea4e36df74 Merge "Controls UI - Multi-user switch updates" into rvc-dev am: 7604a184d9 
Change-Id: Ia36de3c9f7f05ebc727ba3feff436cbccb1b13a0
 2020-05-26 11:50:47 +00:00