TreeHugger Robot
32053de293
Merge "Add sample flags to MediaParser" into rvc-dev am: aa9d95ed9f am: 0301b8b564
...
Change-Id: I6404caa79afa3eeb4e7578b44622c3efbfd81040
2020-03-31 20:21:51 +00:00
Anton Hansson
ece81ff32a
Merge "Remove build workaround for wifi stubs" into rvc-dev am: 2c592f0df3 am: 9686c1c57b
...
Change-Id: Idad5feaa70b553385e1c4912f707e49c74bee243
2020-03-31 20:21:32 +00:00
Automerger Merge Worker
f7bd35851c
Merge "Merge "Delete bugreport file on bugreport cancel" into rvc-dev am: 8f08b1cd40 am: 142c4097ae" into rvc-d1-dev-plus-aosp
2020-03-31 20:21:05 +00:00
TreeHugger Robot
b4199cb527
Merge "Delete bugreport file on bugreport cancel" into rvc-dev am: 8f08b1cd40 am: 142c4097ae
...
Change-Id: Ifbaa2671d8557de61c6c37c885de9ff1a55d99d9
2020-03-31 20:20:59 +00:00
TreeHugger Robot
ebbba5f4ef
Merge "Disable conversation strip" into rvc-dev am: c70636175c am: 4538577955
...
Change-Id: I3096f630cab158071da5aa98bc1b58bcbf345b50
2020-03-31 20:20:53 +00:00
Dmitri Plotnikov
0ae12431c5
Merge "Use ParcelableException to put exception in bundle" into rvc-dev am: 13c7d899da am: 77000b833a
...
Change-Id: Ie1d2b2952a608bdec1fca5bf9d820b72b2a05197
2020-03-31 20:20:35 +00:00
Jon Spivack
5fea7ce353
Merge "ApexManager: Request apexservice only when needed" into rvc-dev am: c44b78d47a am: 4b34d43f8d
...
Change-Id: Iecef76f27b6ff4c9d3e8b72b0d7c5dae8e6b7bff
2020-03-31 20:20:22 +00:00
TreeHugger Robot
5f3bf2a1af
Merge "Guardrail for pull cooldown/timeout" into rvc-dev am: 533a99f3b0 am: 30b9a38675
...
Change-Id: I74615c79380f0a2ac1e7d0c6a3fd97e8a9691038
2020-03-31 20:20:10 +00:00
Cody Kesting
c7103476c4
Merge "Clarify comments for Connectivity Diagnostics reports." am: b187c3c1af am: f4301de657 am: c2f2e461e2
...
Change-Id: I617f5361a7564d3d4fe2a962887e4666d2a0695f
2020-03-31 20:19:45 +00:00
Cody Kesting
9b558f9c93
Merge "Sort administrator UIDs for NetworkCapabilities." am: 976f715d2e am: 39c41d3439 am: b654993f34
...
Change-Id: Idd669be0bd07fe346ab3c007cae2fe15aa3556a4
2020-03-31 20:19:18 +00:00
Cody Kesting
e17c0f51ff
Merge "Add combine() and equals() for NetworkCapabilities admin UIDs." am: 55b71cb731 am: 3e72530a42 am: 88f1f165cf
...
Change-Id: I019ac5a5d19f4bed5a43b94a04313a66ef6d32fd
2020-03-31 20:19:03 +00:00
Cody Kesting
20f48781ee
Merge "Make UiccAccessRule certificate utils accessible." into rvc-dev am: 64d3ed6006 am: c195cf4856
...
Change-Id: I890f1bb4a9ebac1072edbddbccaba6a4d749f542
2020-03-31 20:18:35 +00:00
Michael Wright
e67a7661b9
Merge "Remove registerSection API with optional Executor" into rvc-dev am: ca87d86d59 am: 9dc277395f
...
Change-Id: I94840e610b6836d7aa7714684b850f12ecf859f7
2020-03-31 20:18:20 +00:00
Cody Kesting
969dd4a170
[automerger skipped] Merge "Clean up handling of NetworkCapabilities#administratorUids." into rvc-dev am: 221d383ff9 -s ours am: cd27be82b8 -s ours
...
am skip reason: Change-Id Id630fe9d76aacdaf038fdaa5360f0327520ee0c3 with SHA-1 919385b549
2020-03-31 20:18:13 +00:00
Cody Kesting
d6c39ffe90
Merge "Use IBinder as key for ConnectivityDiagnostics storage in CS." am: f0697914ca am: c295bbab20 am: 8827ce5e8a
...
Change-Id: I64be355630a1cb5f501b38ad1292823260fb1ddf
2020-03-31 20:17:56 +00:00
TreeHugger Robot
daa1683e08
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a18e52f648 -s ours am: 6bf3b92100 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I4c0de3dbc36b50f77a1a4a94b7858b1f03ea7dc7
2020-03-31 20:17:24 +00:00
TreeHugger Robot
4c4b5697b7
Merge "Recycle the bitmap as soon as possible" into rvc-dev am: 4c0116ee1a am: 8393e900a3
...
Change-Id: If0dd17cf794f74790b3d153347c5b3f3be2fba3e
2020-03-31 20:17:06 +00:00
TreeHugger Robot
166e9c6700
Merge "Separate Notification Panel" into rvc-dev am: 47e2a13cab am: 5f0f1e5f19
...
Change-Id: Ifc54259bafc184ba1667a07594b31ea1705ddf0a
2020-03-31 20:16:39 +00:00
Benedict Wong
f6919bce00
[automerger skipped] Merge changes I97ba5903,Icd80b368 into rvc-dev am: 7df7129b40 -s ours am: e2e6d379d9 -s ours
...
am skip reason: Change-Id I97ba5903b3cc1ed6a21c706ed3d78bd8ecbeee0c with SHA-1 399c1365c2
2020-03-31 20:16:10 +00:00
Benedict Wong
a83864b95c
[automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: ef5732b053 -s ours am: 033d06c00d -s ours
...
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 d78ad3d41a
2020-03-31 20:15:44 +00:00
Fabian Kozynski
7afb005ca9
Merge "Added Backup & Restore for SystemUI and controls" into rvc-dev am: 30c2f30f83 am: 15cfd496e4
...
Change-Id: Ibf71379c51a13c6f05e06d2b05f00851314345df
2020-03-31 20:15:12 +00:00
Chris Li
4fde7565f1
Merge "Fix locked second screen on boot" into rvc-dev am: 2455e98420 am: 7cca63d707
...
Change-Id: I47228ee6ed848a0fdaa6de1a1e866c146d7583b6
2020-03-31 20:14:54 +00:00
TreeHugger Robot
89b263c307
Merge "Update the current API dump" into rvc-dev am: 89c98762b9 am: bc8883b084
...
Change-Id: I04a64554fbc334a309ea376415431b6d60ff8893
2020-03-31 20:14:25 +00:00
Xiao Ma
e8c5890118
Merge "Add new method to update Layer2 information when L2 roaming happens." am: cb40a56521 am: 7d1a09e045 am: 1083b27f7c
...
Change-Id: I7600d38e84d381b170ce30321b2e955e3f170224
2020-03-31 20:14:14 +00:00
Neil Fuller
6c01ecbedc
Merge "Misc tidy up before adding geolocation classes" into rvc-dev am: 71271db6bf am: da105f97a8
...
Change-Id: I0acf6243f7e3612a3c09083d33c8255ddeff010d
2020-03-31 20:13:09 +00:00
TreeHugger Robot
dfb1f23d4d
Merge "MediaRouter: Rename requestID with uniqueRequestId" into rvc-dev am: 370d6454d1 am: e9ef80dfbb
...
Change-Id: I910657b6612fdf63754c27b7da5f482d7a530c83
2020-03-31 20:12:52 +00:00
TreeHugger Robot
f29a9cd39b
Merge "PmPermissionsTest: Update test expectations for getPackageSizeInfo" into rvc-dev am: 758aaeda59 am: ea5727ecd5
...
Change-Id: I1eba7742386f457de8bd5e45c672166034e0d554
2020-03-31 20:12:29 +00:00
satayev
5d4c3ca286
Merge "Remove hiddenapi-mappings and hiddenapi-list-docs." am: d5ed17def6 am: fcd3de32fe am: 893fc27f7a
...
Change-Id: Id9d201e02abefdd2b1978acc3a2223171e6eefba
2020-03-31 20:11:33 +00:00
TreeHugger Robot
0301b8b564
Merge "Add sample flags to MediaParser" into rvc-dev am: aa9d95ed9f
...
Change-Id: I8c7bdddf810ac401816b735a44e54e8dc0d20ef7
2020-03-31 20:11:08 +00:00
Anton Hansson
86e10cbbc6
[automerger skipped] Merge "Add package filter for system_server stubs" am: cb425ff365 am: b8c9d67566 -s ours am: 72a3437c0f -s ours
...
am skip reason: Change-Id I144ce6dbfe524106fc7de87318f66390c31b45af with SHA-1 442fcf48c4
2020-03-31 20:10:43 +00:00
Anton Hansson
9686c1c57b
Merge "Remove build workaround for wifi stubs" into rvc-dev am: 2c592f0df3
...
Change-Id: Ided90b754349d577156d50cee869e765bdb6de70
2020-03-31 20:10:35 +00:00
Anton Hansson
ca11b9ba50
[automerger skipped] Merge "Limit framework module api packages" am: 9b193780e3 am: dbb4c1cf7b -s ours am: 2c7019a4a4 -s ours
...
am skip reason: Change-Id Iedc8c309cef8290ac14e1ad32b5b66656145f557 with SHA-1 f79b08b7ab
2020-03-31 20:10:18 +00:00
TreeHugger Robot
4538577955
Merge "Disable conversation strip" into rvc-dev am: c70636175c
...
Change-Id: I2f7a279a54c7fd583e094d0725a25ce5487f34e2
2020-03-31 20:10:11 +00:00
TreeHugger Robot
aa9d95ed9f
Merge "Add sample flags to MediaParser" into rvc-dev
2020-03-31 19:42:44 +00:00
Anton Hansson
2c592f0df3
Merge "Remove build workaround for wifi stubs" into rvc-dev
2020-03-31 19:42:28 +00:00
TreeHugger Robot
c70636175c
Merge "Disable conversation strip" into rvc-dev
2020-03-31 19:21:51 +00:00
Anton Hansson
25ff5fd739
[automerger skipped] Merge "Add default configs for module service stubs" am: a22e680942 am: 7cab79c9e0 -s ours am: 76222d3f7a -s ours
...
am skip reason: Change-Id Iff6a5a840c5dd7731e881d7db379915375d02324 with SHA-1 180ec39abe
2020-03-31 19:15:23 +00:00
Anton Hansson
0fd5b6a3b1
[automerger skipped] Merge "Feed framework-tethering-stubs the src filegroup" am: e1df4292f9 am: 0e5641d26c -s ours am: 16caff3ab3 -s ours
...
am skip reason: Change-Id I5b9ffa211be9c1a7dd8f63d5e7ba2a825d0d3190 with SHA-1 8f56a69b9d
2020-03-31 19:14:51 +00:00
Rubin Xu
7896edc3d9
Merge "Get HAL services with retry" into rvc-dev am: 884aa6afe1 am: fc4f1eafc1
...
Change-Id: Ib4a0366789821a689df40fd8e98529de6cee80c2
2020-03-31 19:13:55 +00:00
Shawn Lin
75a636e8e5
Merge "Fixed incorrect rounded corner size" into rvc-dev am: ae370867b6 am: c262c51b2d
...
Change-Id: I366dc60d6e8b66be428f0cfb5d1c34cf2e2c1c72
2020-03-31 19:13:13 +00:00
TreeHugger Robot
e9150f25c0
Merge "Handle ANR in a separate thread" into rvc-dev am: d11b9a311b am: 1f1f34ddde
...
Change-Id: I2154aaec30c2efbad665bae876bbd6da1823f208
2020-03-31 19:12:22 +00:00
Treehugger Robot
f3271bc214
[automerger skipped] Merge "Bluetooth Metrics: Add metric_id field for Bluetooth metrics to proto. The incremental id is neither a device id nor a pseudo name and therefore PII free." am: 9b575dcdb5 am: 4b325da23a -s ours am: 20919552cd -s ours
...
am skip reason: Change-Id I5393aee2d1940470678c3d00153a4771e5e676e1 with SHA-1 71c3a5d485
2020-03-31 19:11:22 +00:00
Tiger Huang
c01b93fdf7
Merge "Move some unit tests about WindowInsets to CTS" into rvc-dev am: 815543b3a1 am: 58a2eec742
...
Change-Id: Id794294e403546ce2c376e5d7fbb10c41e1955bd
2020-03-31 19:10:53 +00:00
TreeHugger Robot
7b453d99f2
Merge "Properly layout InlineContentView" into rvc-dev am: 7f70f707b5 am: 5ae0e88de6
...
Change-Id: I95370c5db08d5bc22c8438e47102cd3f416f8404
2020-03-31 19:10:32 +00:00
TreeHugger Robot
c1debcdeb1
Merge "Fix potential NPE when removing TaskOrganizerController" into rvc-dev am: b556cb7254 am: 6259ba9842
...
Change-Id: Ic12f9c77f4b65096eae25c7774a890cc826e1580
2020-03-31 19:10:12 +00:00
Ugo Yu
3b577e2da5
Merge "Fix Bluetooth auto turns ON in airplane mode" into rvc-dev am: 88a25ff248 am: 2e423c4e22
...
Change-Id: I941e13605ed3e355276610d481e19a0c30f83770
2020-03-31 19:09:43 +00:00
Ugo Yu
6fffa0001a
Merge "Independent methods to enable/disable BLE mode" into rvc-dev am: dff3794ce1 am: eb03358240
...
Change-Id: I4bbcac01a8c078f599963f5d88ac7779499aee3e
2020-03-31 19:09:21 +00:00
TreeHugger Robot
9c4715c23a
Merge "Unflip bit to disallow FGS dismissal" into rvc-dev am: 7ea1fe4cea am: 97eca1dd7b
...
Change-Id: I3aae4f1a1271222740951d86365782851911c7c7
2020-03-31 19:09:07 +00:00
TreeHugger Robot
9f3ab2bf00
Merge "Update devices list when onRoutesChanged() called" into rvc-dev am: a3645665e4 am: 408fda45fd
...
Change-Id: I2b4f0043c5557f6bbf58dd6b585e211b04403438
2020-03-31 19:08:56 +00:00
Benedict Wong
3ff9932787
Merge "Make VpnProfile.maxMtu default value match Ikev2VpnProfile" am: 328ef02bf3 am: 1ee1f86749 am: 91aa444667
...
Change-Id: I6efac8082e1446db77ee32aed261bd0060709d24
2020-03-31 19:08:23 +00:00
