Mady Mellor
65181df3f1
Merge "Protect all calls to mShortcutHelper with null check" into rvc-dev am: 754636846c am: 1c0cc0feae am: f7d1a4bafc am: ee450da878
...
Change-Id: I034175a4f18992d3dd5e628f0793987a0a417935
2020-04-02 20:43:37 +00:00
Soonil Nagarkar
360f4917b6
Merge "Fix up LocationRequest and ProviderRequest" into rvc-dev am: 240eaaaaab am: 293347f282 am: 76dbf6f6a8 am: e9ced9c212 am: b3c52e20ee
...
Change-Id: I0db66ed691aacde359a59d04f886ee9274a1d01c
2020-04-02 20:43:22 +00:00
Adam Bookatz
a3453b8486
Merge "Avoid getUserBadgeNoBackgroundResId if no badge" into rvc-dev am: 2f559add63 am: 81ed507cfe am: cf459fbbb4 am: f894378343 am: 7b1cfb0419
...
Change-Id: I6c5e0a7c231fa61c3f7ce141d3ddab8ed168e262
2020-04-02 20:43:11 +00:00
Soonil Nagarkar
8c2e4c07c6
Merge "Fix up LocationRequest and ProviderRequest" into rvc-dev am: 240eaaaaab am: 1c5388e7b0 am: 979b91fb8e am: 6afb178bae
...
Change-Id: I3c36cac7c5c45e18e48b7bed7bc741a44aa2b248
2020-04-02 20:41:46 +00:00
Mady Mellor
ee450da878
Merge "Protect all calls to mShortcutHelper with null check" into rvc-dev am: 754636846c am: 1c0cc0feae am: f7d1a4bafc
...
Change-Id: I5a45a231fc7843fd399a1e660cd8bfaf1eac81bc
2020-04-02 20:26:18 +00:00
Soonil Nagarkar
7fe47adb41
Merge "Fix up LocationRequest and ProviderRequest" into rvc-dev am: 240eaaaaab am: 293347f282 am: 14f734fbed am: d8f077de28
...
Change-Id: I49e0d5ec63fca56395fee5463633c21cff73f06d
2020-04-02 20:25:51 +00:00
Automerger Merge Worker
3c3bf17de7
Merge "Merge "Avoid getUserBadgeNoBackgroundResId if no badge" into rvc-dev am: 2f559add63 am: 08da76161c" into rvc-d1-dev-plus-aosp am: 10f73a33a8 am: 680415826f
...
Change-Id: I673b544952df7ecd7c0e689c9ae48df619304e32
2020-04-02 20:25:22 +00:00
Adam Bookatz
23ad552f29
Merge "Avoid getUserBadgeNoBackgroundResId if no badge" into rvc-dev am: 2f559add63 am: 81ed507cfe am: 9c60339434 am: 592d9b70c3
...
Change-Id: Ide6f81439d1bde5f4d7cdb4947503fe6d0d81686
2020-04-02 20:24:47 +00:00
Lucas Dupin
b8002b2ef0
Merge "Fix issue where AOD would not start" into rvc-dev am: b164ea9d7a am: 6ac8410fd3 am: 3dccc387fc am: 081d28e13d am: db73289ad4
...
Change-Id: Iec1a625daa5e086756bda64c4d5f0dac7a7515b0
2020-04-02 20:24:16 +00:00
Automerger Merge Worker
2291e95624
Merge "Merge "Fix issue where AOD would not start" into rvc-dev am: b164ea9d7a am: 6ac8410fd3" into rvc-d1-dev-plus-aosp am: 455f59ed4b am: 7d723070fa
...
Change-Id: I08b19e9782adf84e6ee7bcb59cf1b92170845574
2020-04-02 20:24:02 +00:00
Lucas Dupin
4b3e8a24e4
Merge "Fix issue where AOD would not start" into rvc-dev am: b164ea9d7a am: 6790d6b82a am: 7e79a2e053 am: ae70a1e844
...
Change-Id: I4b2fc31b80bd65bcd892b9bf2d6645ad5cb5907c
2020-04-02 20:23:26 +00:00
Nate Myren
de7cc5fd1c
Merge "Revert "Enable receiver for update user sensitive"" into rvc-dev am: 2328849cc6 am: 8ec416efc2 am: 8a68cc7449 am: 1bdf85fec3 am: d03a21b7ab
...
Change-Id: I03d9267d2a56d1ed69b2761d3c9d4c204c0bf192
2020-04-02 20:23:06 +00:00
Linus Tufvesson
c1f25a530e
[automerger skipped] Merge "RESTRICT AUTOMERGE" into stage-aosp-master am: feeb3bcd39 -s ours am: d72e008b53 -s ours am: decc73af39 -s ours am: 6249f481a6 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic23ef818e1c037ed1f180db84a3b45a3232a2b74
2020-04-02 20:22:44 +00:00
Nate Myren
68e7852776
Merge "Revert "Enable receiver for update user sensitive"" into rvc-dev am: 2328849cc6 am: 5a14c3616e am: 7681313f3f am: a840cd70ff
...
Change-Id: Ibe40704093dd910508db26013e66cac7085a4441
2020-04-02 20:21:50 +00:00
Nate Myren
2d079bd384
Merge "Revert "Enable receiver for update user sensitive"" into rvc-dev am: 2328849cc6 am: 8ec416efc2 am: 1fcc33bdca am: e972cf20f1
...
Change-Id: Ibd5d9b26f4ec4a940bdff60e79eb8b7d114c7c07
2020-04-02 20:21:26 +00:00
Adrian Roos
7f32a1e03f
Merge "AndroidPackageParsingTestBase: Re-throw failures in setUpPackages in individual tests" into rvc-dev am: 8555b9a166 am: d1632fd84c am: ea0718ae74 am: ddfb90f7f5 am: b54996ed27
...
Change-Id: I98d4a9dcb806befe2c16027bc96d4a81b38e6dba
2020-04-02 20:20:47 +00:00
Neil Fuller
11287080eb
Merge "Switch ReferenceWithHistory to use ArrayDeque" into rvc-dev am: c6eea102c7 am: 99ee3fe296 am: f78f201d80 am: d3c7a8e6fa am: 24494c3816
...
Change-Id: If77db9de514b22e3b1930493cb05c941b01a200e
2020-04-02 20:20:08 +00:00
Frank Li
b1997b78ce
Merge "Add new NetworkType for WIFI+CELLULAR+VPN transport" am: abc516b9f9 am: 6ae6d9d125 am: 1bee999329 am: 52cddf916b am: eb25000e9c
...
Change-Id: I4575b912db7457e0e0c1dea4d1af07389a4cf394
2020-04-02 20:19:43 +00:00
Adrian Roos
1bad3481d8
Merge "AndroidPackageParsingTestBase: Re-throw failures in setUpPackages in individual tests" into rvc-dev am: 8555b9a166 am: 3c7b584a0e am: b912114537 am: 7046e18011
...
Change-Id: Id049a0df07a2d6606637f30130ac19d65ac67f05
2020-04-02 20:19:28 +00:00
Neil Fuller
3578ad9de5
Merge "Switch ReferenceWithHistory to use ArrayDeque" into rvc-dev am: c6eea102c7 am: bdda392a64 am: f2dc29fd39 am: a4a0c03e17
...
Change-Id: Icc638ddfade26d3cd8553eb84510cd542a0dde33
2020-04-02 20:19:00 +00:00
Adrian Roos
57cd76f451
Merge "AndroidPackageParsingTestBase: Re-throw failures in setUpPackages in individual tests" into rvc-dev am: 8555b9a166 am: d1632fd84c am: 75e393ef6d am: d6f926bf21
...
Change-Id: I51f05653c50421b39b0d62f0bb3945043c4f1b80
2020-04-02 20:18:35 +00:00
Neil Fuller
0fdb0555f6
Merge "Switch ReferenceWithHistory to use ArrayDeque" into rvc-dev am: c6eea102c7 am: 99ee3fe296 am: f96f6e022b am: 7421cd2278
...
Change-Id: Ie6bbdc4fb050b5e4ad825450b1b84960d8e06212
2020-04-02 20:18:13 +00:00
Ruchir Rastogi
729dd1aa7f
Merge "Store annotation info in LogEvent/FieldValue" into rvc-dev am: c0a892456b am: 4d27d3629a am: 4a59c6c367 am: 21302aae93
...
Change-Id: I312a0b0ab9affc9b73988f48a042bd2783afdb0e
2020-04-02 20:17:48 +00:00
Ruchir Rastogi
b0b3379d40
Merge "Store annotation info in LogEvent/FieldValue" into rvc-dev am: c0a892456b am: 741d10458f am: 6e5d79b6ba am: ea36b89fb2
...
Change-Id: Iec004127fb8c04b59c7d840823367094080db687
2020-04-02 20:17:13 +00:00
Ruchir Rastogi
7df16e19b7
Merge "Store annotation info in LogEvent/FieldValue" into rvc-dev am: c0a892456b am: 741d10458f am: 7be4c20aea am: 2b21bf3315 am: a0de7aff57
...
Change-Id: Icb43942d9a3b26d7c1d48bc2769d38e08b720517
2020-04-02 20:16:16 +00:00
Nikita Ioffe
497fac2c33
[automerger skipped] Merge "Make init.userspace_reboot.is_supported a rw property" into rvc-dev am: d8c1e77cf8 am: a2c34761b3 am: d1635bba87 am: 696de130ba -s ours am: ed951d8d85 -s ours
...
am skip reason: Change-Id I31b9ac7f2c92ce82664a0266aea62faa2bdd365f with SHA-1 5c99905f44
2020-04-02 20:14:41 +00:00
Patrick Baumann
4a0186bc39
Merge "Fixes NPE and adds @Nullable to PackageSetting.pkg" into rvc-dev am: 697c8e9546 am: 8558aeb6f8 am: 526d943c90 am: 0c465b3dc3 am: b942c74fbe
...
Change-Id: Ic7243ef07476e6c2d51c20c72f126198ce622c59
2020-04-02 20:14:12 +00:00
Nikita Ioffe
d45c856e67
[automerger skipped] Merge "Make init.userspace_reboot.is_supported a rw property" into rvc-dev am: d8c1e77cf8 am: a2c34761b3 -s ours am: 24a7859713 -s ours am: 963abfa109 -s ours
...
am skip reason: Change-Id I31b9ac7f2c92ce82664a0266aea62faa2bdd365f with SHA-1 5c99905f44
2020-04-02 20:13:44 +00:00
Soonil Nagarkar
b3c52e20ee
Merge "Fix up LocationRequest and ProviderRequest" into rvc-dev am: 240eaaaaab am: 293347f282 am: 76dbf6f6a8 am: e9ced9c212
...
Change-Id: I5fed49a544129ce8cd9e28d7a0ab4284ac6c0e09
2020-04-02 20:13:17 +00:00
Adam Bookatz
7b1cfb0419
Merge "Avoid getUserBadgeNoBackgroundResId if no badge" into rvc-dev am: 2f559add63 am: 81ed507cfe am: cf459fbbb4 am: f894378343
...
Change-Id: I89db1ad21a7cd9e7d5d2745105e1033f314f7bfb
2020-04-02 20:13:00 +00:00
Patrick Baumann
f176559270
Merge "Fixes NPE and adds @Nullable to PackageSetting.pkg" into rvc-dev am: 697c8e9546 am: 8558aeb6f8 am: 839fe7b4f1 am: 7200d8e175
...
Change-Id: Ic55f2dd1b1b6f997d7130d54d26cd497503efd5a
2020-04-02 20:01:25 +00:00
Nikita Ioffe
f0826c2110
[automerger skipped] Merge "Make init.userspace_reboot.is_supported a rw property" into rvc-dev am: d8c1e77cf8 -s ours am: 4776fc490a -s ours am: 700ba5cf20 -s ours am: f7b534a7fa -s ours
...
am skip reason: Change-Id I31b9ac7f2c92ce82664a0266aea62faa2bdd365f with SHA-1 24e2259e5d
2020-04-02 20:01:04 +00:00
Mady Mellor
f7d1a4bafc
Merge "Protect all calls to mShortcutHelper with null check" into rvc-dev am: 754636846c am: 1c0cc0feae
...
Change-Id: Ibcd40516a6ddfcfc1651b8eb4b8f1ca37a2f27e8
2020-04-02 19:59:39 +00:00
Patrick Baumann
9c2d55186e
Merge "Fixes NPE and adds @Nullable to PackageSetting.pkg" into rvc-dev am: 697c8e9546 am: 2cc9140ed6 am: 9d31dbdc40 am: e38c44d201
...
Change-Id: I2eff4d9e91a8f7f447f753dc1b01ce543d8fae84
2020-04-02 19:59:14 +00:00
Lorenzo Colitti
d827033450
Merge "Rename the *Nat64Prefix to *Nat64PrefixFromDns." am: 65be95c784 am: 97518a0b84 am: 8097b342ae am: 00723d8d50 am: 0385805403
...
Change-Id: I0f6623a5ff918c7d01dcfd6fba076f6559a324fd
2020-04-02 19:58:27 +00:00
Linus Tufvesson
7f06e061ff
[automerger skipped] Merge "RESTRICT AUTOMERGE" into pi-dev am: 0b23243935 -s ours am: 03d66b4241 am: b6cde4b8e3 -s ours am: 904021d71f am: 2f2908c954 am: 6b8ee238d5 am: aeeaf91a7d am: 8d8ceed7b5 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I749bdd08eddd70a12dd671503df981fabf4af442
2020-04-02 19:57:37 +00:00
Linus Tufvesson
264c287eaf
[automerger skipped] Merge "RESTRICT AUTOMERGE" into qt-dev am: 04897a9bbd am: b5d5a667c3 -s ours am: 91500f3e9d am: 8c9c449e87 am: f7fa0239ef am: 79f58a15e5 am: eced5e912d -s ours
...
am skip reason: subject contains skip directive
Change-Id: I7d8a7c2e7537943c0a7887b1fa03e9f9ea1b7b98
2020-04-02 19:57:25 +00:00
Linus Tufvesson
328897f1bc
[automerger skipped] RESTRICT AUTOMERGE am: a9211d687d am: 8f258aaee1 -s ours am: d6f93c95ff am: 18e20b7bbd am: 3a572223c6 am: 482262a069 am: 76cd9bfa67 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I85171093ebbda0a7daf5910550e72362fe1370db
2020-04-02 19:57:22 +00:00
Muhammad Qureshi
66c626ec17
Merge "Log annotations for pulled atoms." into rvc-dev am: c598ff319c am: 07eda491da am: 590e405dca am: ffb4f3c9b5 am: 39b792bb44
...
Change-Id: Id68cbc7e9c66c2a245c6b3d2bd1ddb214d4425e7
2020-04-02 19:56:47 +00:00
Muhammad Qureshi
323514d008
Merge "Use constant names instead of literals" into rvc-dev am: 5a06bb22e5 am: d547a0988c am: bdbbf19e42 am: 8041257d91 am: fee046fae1
...
Change-Id: I74be551c59eb3982aa50b5053724664a1e76fd9a
2020-04-02 19:56:06 +00:00
Jorim Jaggi
a1c26cd0b7
Merge "Mark no longer flaky tests as non flaky" into rvc-dev am: 4218ce69e5 am: f7539d6594 am: 2334f8eb32 am: ead56c3032 am: f6c957c985
...
Change-Id: I2d955951a62a38bdc3c19311554b21db9299129b
2020-04-02 19:55:49 +00:00
Adrian Roos
26f1aa465e
Merge "WindowInsetsAnimation: Fix app driven closing of IME" into rvc-dev am: 56f4b1b9d3 am: 2b8d80b8cb am: fc3ad33c13 am: 4c40a89078 am: ade9a79c9c
...
Change-Id: I6215305ebde50090177f7328d6765299f88cc91e
2020-04-02 19:54:37 +00:00
Adrian Roos
97ffce538e
Merge "WindowInsetsAnimation: Synchronously dispatch window insets animation callbacks" into rvc-dev am: f5a0f80fe2 am: bbec0bba6d am: eaeb0fd700 am: c511c0ce44 am: 46f989ac30
...
Change-Id: I40143493e67ffe5139b76cbde06a464c2f47f5b4
2020-04-02 19:54:34 +00:00
Linus Tufvesson
04102eda97
[automerger skipped] Merge "RESTRICT AUTOMERGE" into pi-dev am: 0b23243935 -s ours am: 03d66b4241 am: b6cde4b8e3 -s ours am: 904021d71f am: 43b2a2a05c am: 7fc5b207ab am: a274bf2f73 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I5ea338a3b2c238409f6748b65e0121a82bce02fd
2020-04-02 19:54:10 +00:00
Linus Tufvesson
b5e491110f
[automerger skipped] Merge "RESTRICT AUTOMERGE" into pi-dev am: 0b23243935 -s ours am: 03d66b4241 am: b6cde4b8e3 -s ours am: 904021d71f am: 2f2908c954 am: edeec85397 am: 0b0add36d7 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib5d2e19f05179efb658c1ee83d788375a5b777fc
2020-04-02 19:53:30 +00:00
Linus Tufvesson
385a77a48b
[automerger skipped] Merge "RESTRICT AUTOMERGE" into qt-dev am: 04897a9bbd am: b5d5a667c3 -s ours am: 91500f3e9d am: 8c9c449e87 am: 2677f7a04b am: d39996e758 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Idc1d54a7184e00701b90be2df88015f56d2749dd
2020-04-02 19:53:13 +00:00
Linus Tufvesson
410e55ae93
[automerger skipped] RESTRICT AUTOMERGE am: a9211d687d am: 8f258aaee1 -s ours am: d6f93c95ff am: 18e20b7bbd am: 8d028714dd am: bba35be0bf -s ours
...
am skip reason: subject contains skip directive
Change-Id: I75eab8b03b1e8f8d5c6914e35e5d1caeb55b9c8b
2020-04-02 19:53:10 +00:00
Automerger Merge Worker
52fca19f3a
Merge changes from topic "am-1fdf43d378e94205a8a66e83865de203" into rvc-d1-dev-plus-aosp am: eb32478e1f am: dca854204a
...
Change-Id: I1f6c2e962aa2f45ae25a4b5c952c44d2b140c33a
2020-04-02 19:51:53 +00:00
Linus Tufvesson
d68958c04f
[automerger skipped] Merge "RESTRICT AUTOMERGE" into qt-dev am: 04897a9bbd am: b5d5a667c3 -s ours am: 91500f3e9d am: 7b9dcf5b7e am: 0a36fdf78d am: b3effb0fe8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I012e72190efe62e0d0999a3cf9d95e46dfe4986d
2020-04-02 19:51:47 +00:00
Soonil Nagarkar
e9ced9c212
Merge "Fix up LocationRequest and ProviderRequest" into rvc-dev am: 240eaaaaab am: 293347f282 am: 76dbf6f6a8
...
Change-Id: Ibbcb098a70e07a3fd2987cfc876fb2ff25592985
2020-04-02 19:49:59 +00:00
