Commit Graph

477332 Commits

Author SHA1 Message Date
TreeHugger Robot
44c3a3aada Merge "Don't include the data dir in zygote library paths." into rvc-dev am: aa9b7407da am: 9893288b79 am: bcfd0170f1
Change-Id: I6d02a53b5d03991c3d41da8c300d7c74c194e51c
2020-03-25 17:16:52 +00:00
TreeHugger Robot
bcfd0170f1 Merge "Don't include the data dir in zygote library paths." into rvc-dev am: aa9b7407da am: 9893288b79
Change-Id: Ic495ebcea524d4331de9d23f0e68a81365aebecd
2020-03-25 16:49:15 +00:00
Winson Chung
9544a24b6a Merge "Account for stopping activities when determining whether to restart" into rvc-dev am: 97b931681f am: b5c15eab24 am: 517c476695
Change-Id: If8ff2907ac502af830f4e77d43e4875fad5a4794
2020-03-25 16:43:12 +00:00
Winson Chung
c1b107d6b3 Merge "Ensure previous background color is reapplied when showing a SurfaceView" into rvc-dev am: 7da77f4141 am: 7cc2b1f149 am: 6db905a7a0
Change-Id: I622970b8b1a76babd3a562d977b52de3f5576084
2020-03-25 16:42:59 +00:00
Rubin Xu
ad51413452 Merge "Clear no_remove_managed_profile retriction when removing test PO" into rvc-dev am: 9747684a07 am: 2d0d3ce038 am: 754d6901be
Change-Id: I336cca56be05c7a5f7e3789025eb8e764b0ad166
2020-03-25 16:42:40 +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
Winson Chung
517c476695 Merge "Account for stopping activities when determining whether to restart" into rvc-dev am: 97b931681f am: b5c15eab24
Change-Id: I1fd195c283c8bb7d602b4335a5dc39ef99e248a0
2020-03-25 16:30:43 +00:00
Winson Chung
6db905a7a0 Merge "Ensure previous background color is reapplied when showing a SurfaceView" into rvc-dev am: 7da77f4141 am: 7cc2b1f149
Change-Id: I7b51bd9cc80d24198c0e1995a87184d51a61b814
2020-03-25 16:30:04 +00:00
Rubin Xu
754d6901be Merge "Clear no_remove_managed_profile retriction when removing test PO" into rvc-dev am: 9747684a07 am: 2d0d3ce038
Change-Id: Ia62d133f6b610c87769e2a007f2b4536a1f173eb
2020-03-25 16:29:54 +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
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
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
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
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
TreeHugger Robot
1cdd553bf1 Merge "Exclude flaky tests from presubmit." into rvc-dev am: 3fe54949f8 am: cc5c8ede92 am: fc4a9688b3
Change-Id: I3713e24a6ff2e964424954c50547761efa3c3882
2020-03-25 15:32:00 +00:00
TreeHugger Robot
fc4a9688b3 Merge "Exclude flaky tests from presubmit." into rvc-dev am: 3fe54949f8 am: cc5c8ede92
Change-Id: I876d578e424019753915b56b1dc03388867ffabe
2020-03-25 15:19:54 +00:00
Josh Tsuji
0f8e8bc9e0 Merge "Adds SYSUI_STATE_BUBBLES_EXPANDED to QuickStepContract." into rvc-dev am: 040c89290b am: bd850de2ed am: f1fe364d2d
Change-Id: Ic4d13be261534d5f2ee7346cfd4e2bbdf8c91cf4
2020-03-25 15:08:04 +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
Josh Tsuji
f1fe364d2d Merge "Adds SYSUI_STATE_BUBBLES_EXPANDED to QuickStepContract." into rvc-dev am: 040c89290b am: bd850de2ed
Change-Id: I3adef5be4980376c7ce3d9bab3ad4fd664a49409
2020-03-25 14:50:27 +00:00
TreeHugger Robot
3fe54949f8 Merge "Exclude flaky tests from presubmit." into rvc-dev 2020-03-25 14:47:51 +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
Torne (Richard Coles)
465c5fb2a3 Don't include the data dir in zygote library paths.
When creating a LoadedApk in a zygote context (app zygote or WebView
zygote), don't add the app's data dir to the list of paths the dynamic
linker is allowed to load libraries from, because the linker's attempt
to canonicalize the path causes SELinux access denials. The process
can't access the data directory at all, so cannot load libraries from
there in any case.

Fixes: 149481620
Test: check for avc denials from webview_zygote
Change-Id: I9aceecaf6067e748cc2251782b0f41661cbb35d8
(cherry picked from commit e1579d4d14)
2020-03-25 14:24:24 +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
f83880cc01 Merge "Add permitted_packages to framework-tethering." into rvc-dev am: 1d0b19f81d am: 6b002160a6 am: 5424c98d7b
Change-Id: Ic7cc8009085bf5b9e22df441bf71383c4091340a
2020-03-25 13:53:47 +00:00
Anton Hansson
679c2012f6 Merge "Make framework-media stubs use the new defaults" into rvc-dev am: 19b40d5beb am: 3065a2196d am: 7297507ab4
Change-Id: I48097be824a6b5ad341ff44b91ca3a84e0c193b1
2020-03-25 13:53:39 +00:00
TreeHugger Robot
ea3f3998a7 Merge "BluetoothHearingAid System APIs now throw an exception if a null BluetoothDevice is passed in" into rvc-dev am: fc099117fc am: 0a40316b51 am: 54be0df2db
Change-Id: I19b98cd00432972532b7006608a14688c109a742
2020-03-25 13:53:30 +00:00
Vladimir Marko
5424c98d7b Merge "Add permitted_packages to framework-tethering." into rvc-dev am: 1d0b19f81d am: 6b002160a6
Change-Id: I09389078e4bde6e49c998bd658ec1d342a46e4eb
2020-03-25 13:53:27 +00:00
Anton Hansson
7297507ab4 Merge "Make framework-media stubs use the new defaults" into rvc-dev am: 19b40d5beb am: 3065a2196d
Change-Id: I6a6c7c88637f90099c41a4f32a61d002617a4a0f
2020-03-25 13:53:19 +00:00
Galia Peycheva
53be90e561 Merge "Make Dream background black" into rvc-dev am: a17d04545b am: e950c8b5cd am: eebbea16df
Change-Id: I8785db348cebc6c9c871256cc63defc3f9d55bdc
2020-03-25 13:53:19 +00:00
TreeHugger Robot
54be0df2db Merge "BluetoothHearingAid System APIs now throw an exception if a null BluetoothDevice is passed in" into rvc-dev am: fc099117fc am: 0a40316b51
Change-Id: Ie7708593b7da68e53321db29a6c7bb833f678130
2020-03-25 13:53:10 +00:00
TreeHugger Robot
513e2d6118 Merge "Fix calculation of the collapsible height" into rvc-dev am: 5cb264d9df am: 0d9c6a8fce am: 9ac5a8106e
Change-Id: Ib6b47d44a6be3e024478c6be2e0c412eae51d780
2020-03-25 13:53:10 +00:00
Galia Peycheva
eebbea16df Merge "Make Dream background black" into rvc-dev am: a17d04545b am: e950c8b5cd
Change-Id: I4b2eca8175890cb897ad4385dbbcfaa21ffb65bf
2020-03-25 13:53:01 +00:00
Anton Hansson
a58b058c69 Merge "Make framework-wifi stubs use the new defaults" into rvc-dev am: 3544feedb7 am: dbf582efb9 am: 5063a4edbf
Change-Id: Iab783fee4c916c424a4414762a1e1b7b9edb5433
2020-03-25 13:53:00 +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
Chalard Jean
d4c76f2969 Merge "Allow MANAGE_TEST_NETWORKS to register limited agents" into rvc-dev am: 09b1ee6077 am: 9ab1f522e1 am: 992decb870
Change-Id: I8ad0e191b1d32545ea4cb485845e8bac0db76453
2020-03-25 13:52:49 +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
Dave Mankoff
25565142ce Merge changes from topic "b150393918-lock-icon" into rvc-dev am: 2728fa3c52 am: c1c9801bd5 am: e0a0413de1
Change-Id: I2e4d19fcaafee9aac9f4efbc903ba0202ac2d384
2020-03-25 13:52:40 +00:00
Martijn Coenen
a0b6a82dbc Merge "Add (hidden) fixupAppDir() API." into rvc-dev am: 1152370510 am: 6ca0760f43 am: 793c8f747d
Change-Id: I6d584ff237e6cba58f073350a746f7b186fda746
2020-03-25 13:52:26 +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
0a40316b51 Merge "BluetoothHearingAid System APIs now throw an exception if a null BluetoothDevice is passed in" into rvc-dev am: fc099117fc
Change-Id: I55bba082fc2e598f89970168babe6c92de0816c7
2020-03-25 13:42:29 +00:00
Galia Peycheva
e950c8b5cd Merge "Make Dream background black" into rvc-dev am: a17d04545b
Change-Id: I98602b12169431cff3b8e8c6b6020f6b8b9b8aed
2020-03-25 13:42:08 +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
9ac5a8106e Merge "Fix calculation of the collapsible height" into rvc-dev am: 5cb264d9df am: 0d9c6a8fce
Change-Id: I6d051bc7fc6f14d7401ede449501084060dbd69c
2020-03-25 13:32:31 +00:00
Anton Hansson
5063a4edbf Merge "Make framework-wifi stubs use the new defaults" into rvc-dev am: 3544feedb7 am: dbf582efb9
Change-Id: I6a1dd36d1fdaa45a5bfb5fe31a4fdbc24391d669
2020-03-25 13:32:25 +00:00
Chalard Jean
992decb870 Merge "Allow MANAGE_TEST_NETWORKS to register limited agents" into rvc-dev am: 09b1ee6077 am: 9ab1f522e1
Change-Id: I0feee01ca1af32c9f858c7b2862d610ba6074b5b
2020-03-25 13:32:16 +00:00