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

482401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
7660049017 Merge "Adds SYSUI_STATE_BUBBLES_EXPANDED to QuickStepContract." into rvc-dev am: 040c89290b am: d55eecb2a8 
Change-Id: Ibe449be703c4bfff504a532371e763278920ec05
 2020-03-25 14:31:32 +00:00
Josh Tsuji
bd850de2ed Merge "Adds SYSUI_STATE_BUBBLES_EXPANDED to QuickStepContract." into rvc-dev am: 040c89290b 
Change-Id: Icea40e566791bb0ac4b89d0d272a17df26e69a26
 2020-03-25 14:31:05 +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
ca897aae38 Merge "Add permitted_packages to framework-tethering." into rvc-dev am: 1d0b19f81d am: 9c989d3330 
Change-Id: I4a56112bc5342ae38067d95d791c673eab7608e9
 2020-03-25 13:56:36 +00:00
Anton Hansson
232e5d7bd8 Merge "Make framework-media stubs use the new defaults" into rvc-dev am: 19b40d5beb am: 1dc1c32415 
Change-Id: I43649dd74981e9e7ad02535185e59d895edb756b
 2020-03-25 13:56:29 +00:00
TreeHugger Robot
1f39dba71d Merge "BluetoothHearingAid System APIs now throw an exception if a null BluetoothDevice is passed in" into rvc-dev am: fc099117fc am: e228bc0b61 
Change-Id: Ide9bfef5c9bc7b459631d145c89d1892d292816e
 2020-03-25 13:56:18 +00:00
Automerger Merge Worker
98916503ba Merge "Merge "Add permitted_packages to framework-tethering." into rvc-dev am: 1d0b19f81d am: 6b002160a6" into rvc-d1-dev-plus-aosp 2020-03-25 13:53:44 +00:00
Vladimir Marko
f0af12fe05 Merge "Add permitted_packages to framework-tethering." into rvc-dev am: 1d0b19f81d am: 6b002160a6 
Change-Id: I4389675d6e1232ccfd97cce1ce9d53e79bb59f44
 2020-03-25 13:53:40 +00:00
Galia Peycheva
41b88d7347 Merge "Make Dream background black" into rvc-dev am: a17d04545b am: 86abaec4b3 
Change-Id: Idfe62fa0f1cf74a1c1098d9e5e5f413a608b05fc
 2020-03-25 13:53:39 +00:00
Anton Hansson
877048166f Merge "Make framework-media stubs use the new defaults" into rvc-dev am: 19b40d5beb am: 3065a2196d 
Change-Id: I948f9c47289485a8c0834a0569cb811676aba871
 2020-03-25 13:53:25 +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
TreeHugger Robot
58eba2c847 Merge "BluetoothHearingAid System APIs now throw an exception if a null BluetoothDevice is passed in" into rvc-dev am: fc099117fc am: 0a40316b51 
Change-Id: Iabff8cf997857eddb78f6c40dc43963025e96c3c
 2020-03-25 13:53:03 +00:00
Vladimir Marko
6b002160a6 Merge "Add permitted_packages to framework-tethering." into rvc-dev am: 1d0b19f81d 
Change-Id: I75d151de8d3c0e35ef27958b6fabf7903d0dcc69
 2020-03-25 13:52:51 +00:00
Anton Hansson
3065a2196d Merge "Make framework-media stubs use the new defaults" into rvc-dev am: 19b40d5beb 
Change-Id: I6c4219ce42bd0a58234e2d695ce935e49f1a5451
 2020-03-25 13:52:40 +00:00
Galia Peycheva
b88190520b Merge "Make Dream background black" into rvc-dev am: a17d04545b am: e950c8b5cd 
Change-Id: Ief6f2bb35cdd6309771fd5176e7f45f9b4f5d251
 2020-03-25 13:52:34 +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