Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
482,430 Commits 3 Branches 0 Tags
5e91c5d145a8c25b3ef2bfed308d699a6a70fd13
Commit Graph

482430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
5e91c5d145 Merge "Don't dispatch IME insets if the target is above IME" into rvc-dev am: 0e503e5ebb am: 4520d4806c 
Change-Id: Ib14aea80cf0c8ee44e7d750763798de8e9a9f804
 2020-03-25 17:38:36 +00:00
TreeHugger Robot
4520d4806c Merge "Don't dispatch IME insets if the target is above IME" into rvc-dev am: 0e503e5ebb 
Change-Id: I44ab58c1989150c865641f66488dd75e95b51c6d
 2020-03-25 17:17:24 +00:00
TreeHugger Robot
0e503e5ebb Merge "Don't dispatch IME insets if the target is above IME" into rvc-dev 2020-03-25 17:01:33 +00:00
Ned Burns
edab3f9c7b Merge "Move inactive user filtering to its own filter" into rvc-dev am: dc3919ab66 am: ccb5630b3c 
Change-Id: If4a07aeec09d2eb40bfdefc8ae41fd1a561a458a
 2020-03-25 16:49:36 +00:00
Christine Tsai
7563df3f4d Merge "Update the cc_benchmark to use the new socket schema" into rvc-dev am: be88f7df21 am: 819aa0f9f0 
Change-Id: I1bc44318bbf2ad11a29d1964b91ab1de01650667
 2020-03-25 16:49:28 +00:00
TreeHugger Robot
63c45b2c9b Merge "Don't include the data dir in zygote library paths." into rvc-dev am: aa9b7407da am: 9893288b79 
Change-Id: I3c7787b4e45128ec437b9d3b8aaebf2da83b8878
 2020-03-25 16:49:13 +00:00
Christine Tsai
819aa0f9f0 Merge "Update the cc_benchmark to use the new socket schema" into rvc-dev am: be88f7df21 
Change-Id: I72ee6099c39454d5cc601fa337249aad4ba2972f
 2020-03-25 16:43:16 +00:00
Christine Tsai
be88f7df21 Merge "Update the cc_benchmark to use the new socket schema" into rvc-dev 2020-03-25 16:41:20 +00:00
Ned Burns
13b4c04ce5 Merge "Move inactive user filtering to its own filter" into rvc-dev am: dc3919ab66 am: 5da7d04fe0 
Change-Id: I37a5fcf27595c91ca0a6b0de0bb988d363c04c91
 2020-03-25 16:38:02 +00:00
TreeHugger Robot
a4926600a6 Merge "Don't include the data dir in zygote library paths." into rvc-dev am: aa9b7407da am: 35bbfae5e7 
Change-Id: I14b2caf450f18ec2d8bc9f351c244bb26b49840d
 2020-03-25 16:37:55 +00:00
Ned Burns
ccb5630b3c Merge "Move inactive user filtering to its own filter" into rvc-dev am: dc3919ab66 
Change-Id: I348640d5422a0a3a501773be47481c585cab59f0
 2020-03-25 16:37:39 +00:00
Anton Hansson
e51bc391b7 [automerger skipped] Merge "Add module_lib and system-server artifacts to sdk dist" am: 33d6fda1e0 am: c2c4454d89 -s ours am: 7570fa1fe2 -s ours 
am skip reason: Change-Id Ia1064e50e987433e5e308527c6770ba2d3e8bde3 with SHA-1 7b0414beb7 is in history

Change-Id: I79c4e0601152e216b319b0ca94ad744073c720ef
 2020-03-25 16:37:38 +00:00
TreeHugger Robot
9893288b79 Merge "Don't include the data dir in zygote library paths." into rvc-dev am: aa9b7407da 
Change-Id: I8fb4d7f609173edb436175338f26bc79d6fa834e
 2020-03-25 16:37:20 +00:00
Ned Burns
5da7d04fe0 Merge "Move inactive user filtering to its own filter" into rvc-dev am: dc3919ab66 
Change-Id: I3be9e6735723ef1932622fc3cd6859c06cc11f52
 2020-03-25 16:30:52 +00:00
TreeHugger Robot
35bbfae5e7 Merge "Don't include the data dir in zygote library paths." into rvc-dev am: aa9b7407da 
Change-Id: I60d203a26ea175db12845a710c75caae65aa90e8
 2020-03-25 16:30:30 +00:00
Winson Chung
08941e5c2d Merge "Account for stopping activities when determining whether to restart" into rvc-dev am: 97b931681f am: b5c15eab24 
Change-Id: Ia2fe4cd03ccf69ff9508a559d2c196c177ec1100
 2020-03-25 16:29:57 +00:00
Anton Hansson
7570fa1fe2 [automerger skipped] Merge "Add module_lib and system-server artifacts to sdk dist" am: 33d6fda1e0 am: c2c4454d89 -s ours 
am skip reason: Change-Id Ia1064e50e987433e5e308527c6770ba2d3e8bde3 with SHA-1 7b0414beb7 is in history

Change-Id: I0ff8faa85c915497c103053fe81c493669fabe55
 2020-03-25 16:29:51 +00:00
Winson Chung
4d4c220aaa Merge "Ensure previous background color is reapplied when showing a SurfaceView" into rvc-dev am: 7da77f4141 am: 7cc2b1f149 
Change-Id: Ib592f9f4685c3a5653acf3ebad7f25982b5237d1
 2020-03-25 16:29:25 +00:00
Ned Burns
dc3919ab66 Merge "Move inactive user filtering to its own filter" into rvc-dev 2020-03-25 16:29:21 +00:00
Rubin Xu
170770e49c Merge "Clear no_remove_managed_profile retriction when removing test PO" into rvc-dev am: 9747684a07 am: 2d0d3ce038 
Change-Id: Ifb5c7ca431c3be8c7593f2721004693a625f07ff
 2020-03-25 16:29:14 +00:00
TreeHugger Robot
aa9b7407da Merge "Don't include the data dir in zygote library paths." into rvc-dev 2020-03-25 16:27:52 +00:00
Winson Chung
ade9f06e73 Merge "Account for stopping activities when determining whether to restart" into rvc-dev am: 97b931681f am: a87cb3c6a6 
Change-Id: I682e272747398cf33424d60170f921880e6f1540
 2020-03-25 16:24:34 +00:00
Winson Chung
6b1169b66a Merge "Ensure previous background color is reapplied when showing a SurfaceView" into rvc-dev am: 7da77f4141 am: b18c003146 
Change-Id: I70c7b5d2902c36a6b29a031fb113600901e359eb
 2020-03-25 16:24:26 +00:00
Winson Chung
a87cb3c6a6 Merge "Account for stopping activities when determining whether to restart" into rvc-dev am: 97b931681f 
Change-Id: Iaca30c58a3393374fd90d88caa404059717ae9c9
 2020-03-25 16:24:23 +00:00
Rubin Xu
c84f4530a4 Merge "Clear no_remove_managed_profile retriction when removing test PO" into rvc-dev am: 9747684a07 am: 8ab1a41a5f 
Change-Id: If8985a4f78020a22dd15959594a7b8bcaffa883e
 2020-03-25 16:24:15 +00:00
Winson Chung
b5c15eab24 Merge "Account for stopping activities when determining whether to restart" into rvc-dev am: 97b931681f 
Change-Id: I1fc934d1a6d601d36fed3a6f2e2f3477f1bc5228
 2020-03-25 16:24:12 +00:00
Anton Hansson
ddba8bcf6d [automerger skipped] Merge "Remove the tethering hiddenapi whitelist entry" am: 083066201e am: acaa1e272b -s ours am: 2fd0292c0f -s ours 
am skip reason: Change-Id I97af6d911c7e9bafdaa2a97102b2131dea6c0896 with SHA-1 e11221c738 is in history

Change-Id: Ie3cd2089481fe4b8bd8804346f1c31a51481cb1c
 2020-03-25 16:24:08 +00:00
Winson Chung
b18c003146 Merge "Ensure previous background color is reapplied when showing a SurfaceView" into rvc-dev am: 7da77f4141 
Change-Id: I5757053aa641a6b0a8512980e268390deb08a2fd
 2020-03-25 16:24:05 +00:00
Winson Chung
7cc2b1f149 Merge "Ensure previous background color is reapplied when showing a SurfaceView" into rvc-dev am: 7da77f4141 
Change-Id: I81f74fba1c9d28be05cea9ebe1577044e9640380
 2020-03-25 16:23:26 +00:00
Winson Chung
97b931681f Merge "Account for stopping activities when determining whether to restart" into rvc-dev 2020-03-25 16:21:00 +00:00
Winson Chung
7da77f4141 Merge "Ensure previous background color is reapplied when showing a SurfaceView" into rvc-dev 2020-03-25 16:20:58 +00:00
Anton Hansson
c2c4454d89 Merge "Add module_lib and system-server artifacts to sdk dist" am: 33d6fda1e0 
Change-Id: I5fece040fdd48a42278bbcf08024b20827f1894c
 2020-03-25 16:13:38 +00:00
Rubin Xu
8ab1a41a5f Merge "Clear no_remove_managed_profile retriction when removing test PO" into rvc-dev am: 9747684a07 
Change-Id: I5c5462657fc826814f184bca1ec1cf8970aef5a5
 2020-03-25 16:12:52 +00:00
Rubin Xu
2d0d3ce038 Merge "Clear no_remove_managed_profile retriction when removing test PO" into rvc-dev am: 9747684a07 
Change-Id: I1e51dcf86d275f1e55905c6f529db9f538704846
 2020-03-25 16:12:24 +00:00
Anton Hansson
2fd0292c0f [automerger skipped] Merge "Remove the tethering hiddenapi whitelist entry" am: 083066201e am: acaa1e272b -s ours 
am skip reason: Change-Id I97af6d911c7e9bafdaa2a97102b2131dea6c0896 with SHA-1 e11221c738 is in history

Change-Id: I9dd14183e31a58173a2e7db0c79a646b7413f456
 2020-03-25 16:04:29 +00:00
Anton Hansson
33d6fda1e0 Merge "Add module_lib and system-server artifacts to sdk dist" 2020-03-25 15:56:51 +00:00
Rubin Xu
9747684a07 Merge "Clear no_remove_managed_profile retriction when removing test PO" into rvc-dev 2020-03-25 15:55:23 +00:00
Anton Hansson
acaa1e272b Merge "Remove the tethering hiddenapi whitelist entry" am: 083066201e 
Change-Id: I70ccc0ba7e8bb3c099bc71185149b281f9b20add
 2020-03-25 15:51:53 +00:00
Treehugger Robot
ad55c7bc65 Merge "Update connected clients when a downstream disappears." am: 5c1ded75db am: 182a648bb1 am: 3984360f64 
Change-Id: I8d1c881e400e31ac7917978143771bf1dd1d17a8
 2020-03-25 15:51:47 +00:00
Anton Hansson
083066201e Merge "Remove the tethering hiddenapi whitelist entry" 2020-03-25 15:35:10 +00:00
Treehugger Robot
3984360f64 Merge "Update connected clients when a downstream disappears." am: 5c1ded75db am: 182a648bb1 
Change-Id: I542acb7f50b1891b89f5fe495c3f58456dbd8d91
 2020-03-25 15:32:41 +00:00
Treehugger Robot
182a648bb1 Merge "Update connected clients when a downstream disappears." am: 5c1ded75db 
Change-Id: I843d779e447f05611f1dd0d8cb57e016398f0f67
 2020-03-25 15:19:55 +00:00
TreeHugger Robot
9ce84266fc Merge "Exclude flaky tests from presubmit." into rvc-dev am: 3fe54949f8 am: cc5c8ede92 
Change-Id: I0436eae1f62ce0706ee3fdee8ca37a4660ec466f
 2020-03-25 15:19:19 +00:00
TreeHugger Robot
104847df55 Merge "Exclude flaky tests from presubmit." into rvc-dev am: 3fe54949f8 am: 760ab3bf8c 
Change-Id: I67038c76ec8f7e298324c74770f553b1d5a220b8
 2020-03-25 15:13:01 +00:00
TreeHugger Robot
760ab3bf8c Merge "Exclude flaky tests from presubmit." into rvc-dev am: 3fe54949f8 
Change-Id: Ib284942ace58f1694d72c2736e630ec7223901a1
 2020-03-25 15:08:21 +00:00
Anton Hansson
60fc5c0761 [automerger skipped] Merge "Make system_server stubs consistent with other stubs" am: c2db55d521 am: c895db5fa1 -s ours am: 08ac58555e -s ours 
am skip reason: Change-Id I2a9318c8ae036edafac086687601fa73d9bf4678 with SHA-1 a49fb99d8c is in history

Change-Id: I730d758e2c464a9e789566e0720c131adc806c53
 2020-03-25 15:08:10 +00:00
TreeHugger Robot
cc5c8ede92 Merge "Exclude flaky tests from presubmit." into rvc-dev am: 3fe54949f8 
Change-Id: Ifeaad55a1ca9258b3b437e814bb0a2bd881b1559
 2020-03-25 15:07:18 +00:00
Treehugger Robot
5c1ded75db Merge "Update connected clients when a downstream disappears." 2020-03-25 15:00:43 +00:00
Tiger Huang
57e2e1cd2e Don't dispatch IME insets if the target is above IME 
The target should not get insets from IME if it is above IME.

Fix: 151098513
Test: atest InsetsStateControllerTest
Change-Id: I68f1defeb09aa1f303bf0f56f3e4766c7effd589
 2020-03-25 22:52:47 +08:00
Josh Tsuji
8cf82ccec3 Merge "Adds SYSUI_STATE_BUBBLES_EXPANDED to QuickStepContract." into rvc-dev am: 040c89290b am: bd850de2ed 
Change-Id: I7c24b3a1e0e485ab2c7aef298481d54295d26ef2
 2020-03-25 14:49:40 +00:00