Commit Graph

505025 Commits

Author SHA1 Message Date
Chavi Weingarten
cf3564b120 Merge "Allow Tasks to set some properties for migrated SC" into rvc-dev am: 54eec4b7f6 am: 91c540c2e8
Change-Id: Ibf1977c654642a59a55927f4d79279b6f867c708
2020-05-29 20:03:18 +00:00
Chavi Weingarten
d3f3134c34 Merge "Allow Tasks to set some properties for migrated SC" into rvc-dev am: 54eec4b7f6 am: ec04b3de82
Change-Id: Id791b3c89afad58d38e63c24f8137bb24e6ab9f3
2020-05-29 20:02:58 +00:00
Chavi Weingarten
91c540c2e8 Merge "Allow Tasks to set some properties for migrated SC" into rvc-dev am: 54eec4b7f6
Change-Id: I8bd175ad6561d911c5b7835c4d419ceb3aa895d6
2020-05-29 19:50:07 +00:00
Chavi Weingarten
ec04b3de82 Merge "Allow Tasks to set some properties for migrated SC" into rvc-dev am: 54eec4b7f6
Change-Id: Icd51142f4c3b773fe7ad84ab0a9d593ffbbd160b
2020-05-29 19:49:51 +00:00
Automerger Merge Worker
5ed5d85dc5 Merge "Merge "Lifecycle: detecting blocked and unhealthy, part 2." into rvc-dev am: 825ad11167 am: 03c17047f0" into rvc-d1-dev-plus-aosp 2020-05-29 19:35:52 +00:00
TreeHugger Robot
9adbda179e Merge "Lifecycle: detecting blocked and unhealthy, part 2." into rvc-dev am: 825ad11167 am: 27ee72a794
Change-Id: I52212768ccd180b3bfc24e71cd8e4c96bc148591
2020-05-29 19:35:45 +00:00
TreeHugger Robot
7fcd82d25f Merge "Lifecycle: detecting blocked and unhealthy, part 2." into rvc-dev am: 825ad11167 am: 03c17047f0
Change-Id: I47e58463be094cae3b887277c75f06257dc58627
2020-05-29 19:35:45 +00:00
TreeHugger Robot
fbbe94dc1a Merge "Close a file descriptor that's a copy of the one that the receiver receives." into rvc-dev am: 219daf9eef am: 4f919cdef0
Change-Id: I1e9df929de2fd06ca22189c787365569ee50e6d6
2020-05-29 19:35:10 +00:00
TreeHugger Robot
f47dcd90ef Merge "Close a file descriptor that's a copy of the one that the receiver receives." into rvc-dev am: 219daf9eef am: ebf33109ff
Change-Id: I5a7b6b8a52127ce28687a13e327210f6a2960de4
2020-05-29 19:35:01 +00:00
Chavi Weingarten
54eec4b7f6 Merge "Allow Tasks to set some properties for migrated SC" into rvc-dev 2020-05-29 19:31:57 +00:00
TreeHugger Robot
27ee72a794 Merge "Lifecycle: detecting blocked and unhealthy, part 2." into rvc-dev am: 825ad11167
Change-Id: I5dd609fb62c658b056c2b32efe85354ec90ffea3
2020-05-29 19:19:06 +00:00
TreeHugger Robot
03c17047f0 Merge "Lifecycle: detecting blocked and unhealthy, part 2." into rvc-dev am: 825ad11167
Change-Id: Ia1690714898b220ff1f287bab6f1333255635251
2020-05-29 19:18:56 +00:00
TreeHugger Robot
4f919cdef0 Merge "Close a file descriptor that's a copy of the one that the receiver receives." into rvc-dev am: 219daf9eef
Change-Id: I14625c5d29608b15c078d5421bf9ddf1162bdbc4
2020-05-29 19:18:08 +00:00
TreeHugger Robot
ebf33109ff Merge "Close a file descriptor that's a copy of the one that the receiver receives." into rvc-dev am: 219daf9eef
Change-Id: Ic46b4ff1028bfd49a54e88ecc499edc91ab4afee
2020-05-29 19:18:08 +00:00
TreeHugger Robot
825ad11167 Merge "Lifecycle: detecting blocked and unhealthy, part 2." into rvc-dev 2020-05-29 19:04:37 +00:00
TreeHugger Robot
219daf9eef Merge "Close a file descriptor that's a copy of the one that the receiver receives." into rvc-dev 2020-05-29 19:01:30 +00:00
TreeHugger Robot
becc58b8af Merge "Revert "Don't kill apps for OP_REQUEST_INSTALL_PACKAGES on targetSdk < 26."" into rvc-dev am: d4fe81e7e7 am: dcbdd0b2ae
Change-Id: I090e7a0f50c0797f413fd4f27f3d8165531ba693
2020-05-29 18:44:32 +00:00
TreeHugger Robot
737e980003 Merge "Revert "Don't kill apps for OP_REQUEST_INSTALL_PACKAGES on targetSdk < 26."" into rvc-dev am: d4fe81e7e7 am: 6bccb52807
Change-Id: If1851e04c4e8f32d4cca1cc940decb6dfdbbe9a0
2020-05-29 18:44:22 +00:00
TreeHugger Robot
6bccb52807 Merge "Revert "Don't kill apps for OP_REQUEST_INSTALL_PACKAGES on targetSdk < 26."" into rvc-dev am: d4fe81e7e7
Change-Id: I055922048608c1998ac44d1f200bd997e69ca393
2020-05-29 18:31:35 +00:00
TreeHugger Robot
dcbdd0b2ae Merge "Revert "Don't kill apps for OP_REQUEST_INSTALL_PACKAGES on targetSdk < 26."" into rvc-dev am: d4fe81e7e7
Change-Id: Icb0ff52f07ff8ff50e065768d27b98618bcf9088
2020-05-29 18:30:55 +00:00
TreeHugger Robot
d4fe81e7e7 Merge "Revert "Don't kill apps for OP_REQUEST_INSTALL_PACKAGES on targetSdk < 26."" into rvc-dev 2020-05-29 18:27:45 +00:00
TreeHugger Robot
b6b4f2d5f1 Merge changes from topic "controls_config" into rvc-dev am: 61d46be2c2 am: 10739665e3
Change-Id: I5d54e1ff16dcc31459d2fca3113a9ba053d8dde0
2020-05-29 18:16:17 +00:00
Automerger Merge Worker
bce8c7c088 Merge "Merge "Revert "Revert "Call noteOperation() in ShellDelegate so that noteOp() really passes.""" into rvc-dev am: 664ef14581 am: e10088fbea" into rvc-d1-dev-plus-aosp 2020-05-29 18:16:08 +00:00
TreeHugger Robot
76eac8180f Merge "Revert "Revert "Call noteOperation() in ShellDelegate so that noteOp() really passes.""" into rvc-dev am: 664ef14581 am: e10088fbea
Change-Id: I93f6bbb899ab1cb17dde86d80a9ffa0d2877b62e
2020-05-29 18:16:00 +00:00
TreeHugger Robot
5bcd7a857b Merge changes from topic "controls_config" into rvc-dev am: 61d46be2c2 am: 181c47ad64
Change-Id: I4b6a67adb954b76d26e1b6495f6707f2660fecb2
2020-05-29 18:15:56 +00:00
TreeHugger Robot
af9dc84de7 Merge "Revert "Revert "Call noteOperation() in ShellDelegate so that noteOp() really passes.""" into rvc-dev am: 664ef14581 am: e498bbb34e
Change-Id: Idcf577d0329ccb8865e07586c58568c1ccb20c71
2020-05-29 18:15:26 +00:00
Ryan Mitchell
6891efd53f Merge "Install system app in greatest priority partition" into rvc-dev am: d32418a72a am: 32a8e378e4
Change-Id: I7213612cc45b83e96600ac626fb6d12caf24acfb
2020-05-29 18:15:04 +00:00
TreeHugger Robot
10739665e3 Merge changes from topic "controls_config" into rvc-dev am: 61d46be2c2
Change-Id: Iafcebeadeab0dbac7f561fe4993fc9aa0865d2ad
2020-05-29 18:15:01 +00:00
Ryan Mitchell
4053dfca5e Merge "Install system app in greatest priority partition" into rvc-dev am: d32418a72a am: d5bfbd0f27
Change-Id: Ibd5291cc48b25d168fd7bae736c180ff28916b8b
2020-05-29 18:14:54 +00:00
TreeHugger Robot
181c47ad64 Merge changes from topic "controls_config" into rvc-dev am: 61d46be2c2
Change-Id: Ifcba3a0e09e93748dfcad14d1baaab20d430885f
2020-05-29 18:14:50 +00:00
TreeHugger Robot
61d46be2c2 Merge changes from topic "controls_config" into rvc-dev
* changes:
  Controls UI - Allow seeding for multiple apps
  Controls UI - Support seeding for up to 6 structures
2020-05-29 18:12:43 +00:00
TreeHugger Robot
e10088fbea Merge "Revert "Revert "Call noteOperation() in ShellDelegate so that noteOp() really passes.""" into rvc-dev am: 664ef14581
Change-Id: I4b36190d00c8ef244709bed96235ddd1423efd7f
2020-05-29 18:12:27 +00:00
TreeHugger Robot
e498bbb34e Merge "Revert "Revert "Call noteOperation() in ShellDelegate so that noteOp() really passes.""" into rvc-dev am: 664ef14581
Change-Id: Ied93c7a8cb970a00f55ec781c3837e703487ce6c
2020-05-29 18:11:54 +00:00
Ryan Mitchell
32a8e378e4 Merge "Install system app in greatest priority partition" into rvc-dev am: d32418a72a
Change-Id: I4fa9569fc48dafc38538e46893597a4ec248a254
2020-05-29 18:11:47 +00:00
Ryan Mitchell
d5bfbd0f27 Merge "Install system app in greatest priority partition" into rvc-dev am: d32418a72a
Change-Id: I0eff29ef53abbafb14e0210aa40b1c6bc02c6900
2020-05-29 18:11:28 +00:00
TreeHugger Robot
664ef14581 Merge "Revert "Revert "Call noteOperation() in ShellDelegate so that noteOp() really passes.""" into rvc-dev 2020-05-29 18:07:16 +00:00
Evan Rosky
2c87646493 Merge "Post insets update to handler" into rvc-dev am: dcb47baf63 am: 20c471a1b4
Change-Id: Ifed2156677edb33295acd458247c8b8196dfbecd
2020-05-29 18:05:51 +00:00
Ryan Mitchell
d32418a72a Merge "Install system app in greatest priority partition" into rvc-dev 2020-05-29 18:05:31 +00:00
Automerger Merge Worker
85d15c2b6c Merge "Merge "Post insets update to handler" into rvc-dev am: dcb47baf63 am: 0233bf77eb" into rvc-d1-dev-plus-aosp 2020-05-29 18:05:21 +00:00
Evan Rosky
5a7949dd18 Merge "Post insets update to handler" into rvc-dev am: dcb47baf63 am: 0233bf77eb
Change-Id: Id390204a26af9429d258ed61bc1a4e9515188d46
2020-05-29 18:05:15 +00:00
Automerger Merge Worker
3cf8dd6acf Merge "Merge "Don't reset OOM adjType to cch-empty during recomputing on cycles" into rvc-dev am: e72bd54f44 am: a99693ce6c" into rvc-d1-dev-plus-aosp 2020-05-29 18:05:13 +00:00
Jing Ji
76d8c80c94 Merge "Don't reset OOM adjType to cch-empty during recomputing on cycles" into rvc-dev am: e72bd54f44 am: a99693ce6c
Change-Id: I55f50d178abc3cc4ebc768e5bcdb03348a966ddc
2020-05-29 18:05:02 +00:00
Jing Ji
4223fda7d6 Merge "Don't reset OOM adjType to cch-empty during recomputing on cycles" into rvc-dev am: e72bd54f44 am: fcf7ca34a0
Change-Id: Ib76d037194bf644f2c6a9f5109b682d951dace8f
2020-05-29 18:04:59 +00:00
Automerger Merge Worker
160d202fe0 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 31e7a3411e -s ours" into rvc-d1-dev-plus-aosp 2020-05-29 18:04:53 +00:00
TreeHugger Robot
4b3d46a8ff [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 31e7a3411e -s ours
am skip reason: subject contains skip directive

Change-Id: I341b1546abf2f6908f0f678a72cc3029dafa1fbd
2020-05-29 18:04:44 +00:00
TreeHugger Robot
72bc59069f Merge "Avoid Asset::LoadImpl crash when getBuffer is null" into rvc-dev am: 058945a476 am: b86a44f81a
Change-Id: Icc0f715da3c70809ec36a71000cd8d7dc0fb7343
2020-05-29 18:04:37 +00:00
TreeHugger Robot
73be1ffbd1 Merge "Avoid Asset::LoadImpl crash when getBuffer is null" into rvc-dev am: 058945a476 am: 87fe5e01cd
Change-Id: I6ca25fd7149ad334477a0304631e64ed7c2b7408
2020-05-29 18:04:18 +00:00
Evan Rosky
20c471a1b4 Merge "Post insets update to handler" into rvc-dev am: dcb47baf63
Change-Id: I1efa02a59700bac93933636024de7ee3ec5233c0
2020-05-29 18:04:07 +00:00
Evan Rosky
0233bf77eb Merge "Post insets update to handler" into rvc-dev am: dcb47baf63
Change-Id: I263a18fa4a7d461310d6be55f68ab2248022e8f7
2020-05-29 18:03:41 +00:00
Evan Rosky
dcb47baf63 Merge "Post insets update to handler" into rvc-dev 2020-05-29 17:59:52 +00:00