Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
475,966 Commits 3 Branches 0 Tags
7570fa1fe204db7479ee33d3efd6d77451c43164
Commit Graph

475966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
760ab3bf8c Merge "Exclude flaky tests from presubmit." into rvc-dev am: 3fe54949f8 
Change-Id: Ib284942ace58f1694d72c2736e630ec7223901a1
 2020-03-25 15:08:21 +00:00
Treehugger Robot
5c1ded75db Merge "Update connected clients when a downstream disappears." 2020-03-25 15:00:43 +00:00
Anton Hansson
08ac58555e [automerger skipped] Merge "Make system_server stubs consistent with other stubs" am: c2db55d521 am: c895db5fa1 -s ours 
am skip reason: Change-Id I2a9318c8ae036edafac086687601fa73d9bf4678 with SHA-1 a49fb99d8c is in history

Change-Id: I4b3e06b5708e5c536811caba3f058c6984fa815f
 2020-03-25 14:49:28 +00:00
TreeHugger Robot
3fe54949f8 Merge "Exclude flaky tests from presubmit." into rvc-dev 2020-03-25 14:47:51 +00:00
Anton Hansson
c895db5fa1 Merge "Make system_server stubs consistent with other stubs" am: c2db55d521 
Change-Id: I2e4e653f8d1345f8c91c3e251655ea21c51c3fc7
 2020-03-25 14:31:49 +00:00
Josh Tsuji
d55eecb2a8 Merge "Adds SYSUI_STATE_BUBBLES_EXPANDED to QuickStepContract." into rvc-dev am: 040c89290b 
Change-Id: I1142c8161e43d249a1fd88ca0db64fb2bc6f4144
 2020-03-25 14:19:36 +00:00
Anton Hansson
c2db55d521 Merge "Make system_server stubs consistent with other stubs" 2020-03-25 14:18:31 +00:00
Josh Tsuji
040c89290b Merge "Adds SYSUI_STATE_BUBBLES_EXPANDED to QuickStepContract." into rvc-dev 2020-03-25 14:16:48 +00:00
Rubin Xu
8d23b6bebd Clear no_remove_managed_profile retriction when removing test PO 
Bug: 149898237
Test: atest com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest
Change-Id: I719ee98c7dda5e256e5c8e45b52888a130d6ff5a
 2020-03-25 14:06:35 +00:00
Vladimir Marko
9c989d3330 Merge "Add permitted_packages to framework-tethering." into rvc-dev am: 1d0b19f81d 
Change-Id: Iada058c91acebc7ae95cb7cb8fae4584be37ab3a
 2020-03-25 13:53:19 +00:00
Anton Hansson
1dc1c32415 Merge "Make framework-media stubs use the new defaults" into rvc-dev am: 19b40d5beb 
Change-Id: I89e0f0666f25ce254bc7711ab7964f5a611d4874
 2020-03-25 13:53:09 +00:00
Vladimir Marko
1d0b19f81d Merge "Add permitted_packages to framework-tethering." into rvc-dev 2020-03-25 13:50:51 +00:00
Anton Hansson
19b40d5beb Merge "Make framework-media stubs use the new defaults" into rvc-dev 2020-03-25 13:45:22 +00:00
TreeHugger Robot
e228bc0b61 Merge "BluetoothHearingAid System APIs now throw an exception if a null BluetoothDevice is passed in" into rvc-dev am: fc099117fc 
Change-Id: I1f8863a291515441a410f1c5339b7eb3eef46cda
 2020-03-25 13:42:54 +00:00
Galia Peycheva
86abaec4b3 Merge "Make Dream background black" into rvc-dev am: a17d04545b 
Change-Id: Iaf3b90a8dd3ca16c9beb7f635352fe877dac5bca
 2020-03-25 13:42:29 +00:00
TreeHugger Robot
fc099117fc Merge "BluetoothHearingAid System APIs now throw an exception if a null BluetoothDevice is passed in" into rvc-dev 2020-03-25 13:35:10 +00:00
Galia Peycheva
a17d04545b Merge "Make Dream background black" into rvc-dev 2020-03-25 13:34:15 +00:00
TreeHugger Robot
af4ed634cf Merge "Fix calculation of the collapsible height" into rvc-dev am: 5cb264d9df 
Change-Id: I5759366868bdd770959f20ac0c6cf04031f8b11f
 2020-03-25 13:32:05 +00:00
Julia Reynolds
0e975c25ef Merge "Make sure the right DND config is used" am: 749cd52664 am: 4e7a5bf7db 
Change-Id: I69cfd03527c180637be5b5e658c2ff64b300bc85
 2020-03-25 13:31:53 +00:00
TreeHugger Robot
5cb264d9df Merge "Fix calculation of the collapsible height" into rvc-dev 2020-03-25 13:25:56 +00:00
Anton Hansson
10e880cdcf Merge "Make framework-wifi stubs use the new defaults" into rvc-dev am: 3544feedb7 
Change-Id: Ie4aac0926f63c5a8806e8844d916c5313a18e46d
 2020-03-25 13:25:11 +00:00
Anton Hansson
3544feedb7 Merge "Make framework-wifi stubs use the new defaults" into rvc-dev 2020-03-25 13:21:40 +00:00
Chalard Jean
3de712be75 Merge "Allow MANAGE_TEST_NETWORKS to register limited agents" into rvc-dev am: 09b1ee6077 
Change-Id: Ic896aa36b6819bcc297ce53ba8f1345ba4b6a9e4
 2020-03-25 13:19:22 +00:00
Chalard Jean
09b1ee6077 Merge "Allow MANAGE_TEST_NETWORKS to register limited agents" into rvc-dev 2020-03-25 13:15:46 +00:00
Lorenzo Colitti
fc6e7252c4 Update connected clients when a downstream disappears. 
Otherwise, if another downstream of the same type reappears, the
code would fire a callback with the previous list of clients.

Bug: 150644681
Test: atest TetheringIntegrationTests:EthernetTetheringTest --rerun-until-failure 100
Change-Id: I6b34ea747ae1831001077f44879bb6828dcecc96
 2020-03-25 22:14:46 +09:00
Dave Mankoff
6bdf980e98 Merge changes from topic "b150393918-lock-icon" into rvc-dev am: 2728fa3c52 
Change-Id: Ie24e54e99f6c70168aebb9bdd6c634afd6f8e613
 2020-03-25 13:12:49 +00:00
Julia Reynolds
4e7a5bf7db Merge "Make sure the right DND config is used" am: 749cd52664 
Change-Id: Iaa07c8884f21e4fc50a8a54d4b28e60e8dde66ba
 2020-03-25 13:12:09 +00:00
Martijn Coenen
eb0e529c06 Merge "Add (hidden) fixupAppDir() API." into rvc-dev am: 1152370510 
Change-Id: I28db5731911db7029a0e5a58ccbe6a2db2314292
 2020-03-25 13:12:07 +00:00
Dave Mankoff
2728fa3c52 Merge changes from topic "b150393918-lock-icon" into rvc-dev 
* changes:
  Cache icon drawables.
  Remove injection from LockIcon.
 2020-03-25 13:11:58 +00:00
Julia Reynolds
749cd52664 Merge "Make sure the right DND config is used" 2020-03-25 12:59:05 +00:00
Martijn Coenen
1152370510 Merge "Add (hidden) fixupAppDir() API." into rvc-dev 2020-03-25 12:56:47 +00:00
Anton Hansson
6aae88a6ac Merge "Remove the tethering hiddenapi whitelist entry" into rvc-dev am: 7fe2d29f1b 
Change-Id: I85e6607504989e7825d9029696a5be19ab2a1814
 2020-03-25 12:49:19 +00:00
Anton Hansson
260ed3193c Merge "Make framework-sdkextensions stubs use the new defaults" into rvc-dev am: bc2ea8f88f 
Change-Id: I249de7e64f2ac76c87aa3b19e353ff2616b28b91
 2020-03-25 12:48:50 +00:00
Joe Huang
57e795d26c Merge "Use sub specific telephony for emergency supl" into rvc-dev am: a02b54d79c 
Change-Id: I8a062b662c441d13e766ee101df93af79618439d
 2020-03-25 12:48:26 +00:00
Dante Russo
040982dbf4 Set the Network Specifier on Emergency SUPL am: dffe0cee3c 
Change-Id: I8925a5abffd0a72acb14072b70d2ef033bf16836
 2020-03-25 12:48:23 +00:00
Anton Hansson
7fe2d29f1b Merge "Remove the tethering hiddenapi whitelist entry" into rvc-dev 2020-03-25 12:42:23 +00:00