Commit Graph

470422 Commits

Author SHA1 Message Date
Automerger Merge Worker
caa448af88 Merge "Fix LogEventQueue_tests" into rvc-dev am: 06d2fe8d83 am: 172b5785db
Change-Id: Idd7ba0575190bb304d1c6727c8e2805aff45c2e7
2020-02-28 18:40:13 +00:00
Automerger Merge Worker
53934203d9 [automerger skipped] Merge "Hide TelephonyRegistryManager." am: 3300730d3d am: c7243a6ded -s ours am: 25aa9a9d65 -s ours
am skip reason: Change-Id I2b47ab45839f07494dcad4f1878809a55ddd3087 with SHA-1 7411d22e57 is in history

Change-Id: I38808de20c5e86dd1c31e87591aa418294df5266
2020-02-28 18:40:05 +00:00
Automerger Merge Worker
516ecf0018 [automerger skipped] Merge "Hide CarrierMessagingServiceWrapper for now." am: 796d96ed05 am: 6ae341666f -s ours am: 38b5ac44c1 -s ours
am skip reason: Change-Id Icb65f90261ea6000aecd72a1888d5ee23eed6527 with SHA-1 e75a35d3b3 is in history

Change-Id: I88f6e1e185241036d5dffecbc02c9560b8c2611e
2020-02-28 18:39:38 +00:00
Automerger Merge Worker
172b5785db Merge "Fix LogEventQueue_tests" into rvc-dev am: 06d2fe8d83
Change-Id: I8dbbee1657a2dd5c99d9a39d1fc278a358e0c534
2020-02-28 18:32:47 +00:00
Automerger Merge Worker
25aa9a9d65 [automerger skipped] Merge "Hide TelephonyRegistryManager." am: 3300730d3d am: c7243a6ded -s ours
am skip reason: Change-Id I2b47ab45839f07494dcad4f1878809a55ddd3087 with SHA-1 7411d22e57 is in history

Change-Id: Id9d3c5162d8404fcf42cad654d8f55c30890a450
2020-02-28 18:22:52 +00:00
Automerger Merge Worker
38b5ac44c1 [automerger skipped] Merge "Hide CarrierMessagingServiceWrapper for now." am: 796d96ed05 am: 6ae341666f -s ours
am skip reason: Change-Id Icb65f90261ea6000aecd72a1888d5ee23eed6527 with SHA-1 e75a35d3b3 is in history

Change-Id: Ib1364d89158ae59af94e8933fe3ce8a644111280
2020-02-28 18:22:30 +00:00
Ruchir Rastogi
06d2fe8d83 Merge "Fix LogEventQueue_tests" into rvc-dev 2020-02-28 18:20:07 +00:00
Automerger Merge Worker
e050a74de1 [automerger skipped] Merge "Prevent NPE in CustomTile" into rvc-dev am: c8bb1b3286 am: 1b24ad3fe8 -s ours
am skip reason: Change-Id I0ee11806c0047e0e524f5201d369bee51beba451 with SHA-1 2648a2a99a is in history

Change-Id: I1bf61d2bfa093765a2e4193cc8d725252a7fc60d
2020-02-28 18:12:47 +00:00
Automerger Merge Worker
c7243a6ded Merge "Hide TelephonyRegistryManager." am: 3300730d3d
Change-Id: I1a15036924ea11e6fa1a95d29ff342f0b39fcd27
2020-02-28 18:06:07 +00:00
Automerger Merge Worker
e25599c34b Merge "Prevent NPE in CustomTile" into rvc-dev am: c8bb1b3286 am: eed6a477c9
Change-Id: Idf511a966b3e22e754ffb55d8cc10121f876ddf4
2020-02-28 18:05:59 +00:00
Automerger Merge Worker
1b24ad3fe8 Merge "Prevent NPE in CustomTile" into rvc-dev am: c8bb1b3286
Change-Id: I4b1dfb34700fdc5f83385d810a05fe69780d85e1
2020-02-28 18:05:44 +00:00
Automerger Merge Worker
6ae341666f Merge "Hide CarrierMessagingServiceWrapper for now." am: 796d96ed05
Change-Id: Ib5fe29011df2163119eb6bbbf08aa8847cdf7595
2020-02-28 18:05:39 +00:00
Automerger Merge Worker
ce73847c3c Merge "Merge "DisplayModeDirector: use configGroup when choosing default config" into rvc-dev am: 97ce4799af am: 86a7b2c344" into rvc-d1-dev-plus-aosp 2020-02-28 18:05:27 +00:00
Automerger Merge Worker
eed6a477c9 Merge "Prevent NPE in CustomTile" into rvc-dev am: c8bb1b3286
Change-Id: Ib9b6e4c30f20589e848b9543ef64919b77df6ca8
2020-02-28 18:05:25 +00:00
Automerger Merge Worker
2880205f97 Merge "DisplayModeDirector: use configGroup when choosing default config" into rvc-dev am: 97ce4799af am: 86a7b2c344
Change-Id: Ibfd46b3e2ac75741aea47bec32f9eed91c643226
2020-02-28 18:05:19 +00:00
Automerger Merge Worker
3e5630da86 Merge "DisplayModeDirector: use configGroup when choosing default config" into rvc-dev am: 97ce4799af am: 1d1603ecaf
Change-Id: Ic1ea34a5cb934805fc0cc8cf8d7f44d12d6b3e61
2020-02-28 18:05:15 +00:00
Automerger Merge Worker
dea0e0edc2 Merge "Allow blocking calls to InstrumentationWatcher" into rvc-dev am: 9e0ea0c953 am: eea08a9895
Change-Id: I7ae167cdae8de2a6d2b9c7885c1b456585c7c475
2020-02-28 18:05:04 +00:00
Automerger Merge Worker
1d03106acc Merge "Allow blocking calls to InstrumentationWatcher" into rvc-dev am: 9e0ea0c953 am: aafa4ff23a
Change-Id: I49e2fffa50a761b293fb8980096aa46816a833af
2020-02-28 18:04:54 +00:00
TreeHugger Robot
c8bb1b3286 Merge "Prevent NPE in CustomTile" into rvc-dev 2020-02-28 18:01:02 +00:00
Automerger Merge Worker
1d1603ecaf Merge "DisplayModeDirector: use configGroup when choosing default config" into rvc-dev am: 97ce4799af
Change-Id: I8628a8343add3fe952984cf30e09e2635d9166cf
2020-02-28 17:46:17 +00:00
Automerger Merge Worker
86a7b2c344 Merge "DisplayModeDirector: use configGroup when choosing default config" into rvc-dev am: 97ce4799af
Change-Id: If1c1812dea842b84cf3dc80d8d503367f3ff34bc
2020-02-28 17:45:57 +00:00
Amit Mahajan
3300730d3d Merge "Hide TelephonyRegistryManager." 2020-02-28 17:45:26 +00:00
Amit Mahajan
796d96ed05 Merge "Hide CarrierMessagingServiceWrapper for now." 2020-02-28 17:45:20 +00:00
TreeHugger Robot
97ce4799af Merge "DisplayModeDirector: use configGroup when choosing default config" into rvc-dev 2020-02-28 17:43:40 +00:00
Automerger Merge Worker
aafa4ff23a Merge "Allow blocking calls to InstrumentationWatcher" into rvc-dev am: 9e0ea0c953
Change-Id: Id60143ec80602d5c27ee25606fcfa8a92ef12cd7
2020-02-28 17:40:42 +00:00
Automerger Merge Worker
eea08a9895 Merge "Allow blocking calls to InstrumentationWatcher" into rvc-dev am: 9e0ea0c953
Change-Id: Idfb9a39f526ee95bf3f10722724601d33ba6a735
2020-02-28 17:40:31 +00:00
Dmitri Plotnikov
9e0ea0c953 Merge "Allow blocking calls to InstrumentationWatcher" into rvc-dev 2020-02-28 17:29:13 +00:00
Automerger Merge Worker
ee489d0067 Merge "Battery saver dark mode bug" into rvc-dev am: b86cf15c28 am: 425ca93883
Change-Id: I0dad3d3623075fed023ebe893b0b896421c28880
2020-02-28 17:13:08 +00:00
Automerger Merge Worker
d3de5e55bf Merge "Merge "Fix Sharesheet grid items not aligned issue" into rvc-dev am: d113c5e037 am: 4aa308aff1" into rvc-d1-dev-plus-aosp 2020-02-28 17:13:05 +00:00
Automerger Merge Worker
6439062795 Merge "Fix Sharesheet grid items not aligned issue" into rvc-dev am: d113c5e037 am: 4aa308aff1
Change-Id: I926daba855ced48b68ec4bf609492f3097f66014
2020-02-28 17:12:48 +00:00
Automerger Merge Worker
d328b4358e Merge "Battery saver dark mode bug" into rvc-dev am: b86cf15c28 am: b09e86b45f
Change-Id: I3778b49ac376efa608e28b0aac2cf0dbaa3b92bf
2020-02-28 17:12:47 +00:00
Automerger Merge Worker
d3cd4eb545 Merge "Merge "Fix Sharesheet grid items not aligned issue" into rvc-dev am: d113c5e037 am: f0065d66ac" into rvc-d1-dev-plus-aosp 2020-02-28 17:12:39 +00:00
Automerger Merge Worker
8cdf7fd079 Merge "Fix Sharesheet grid items not aligned issue" into rvc-dev am: d113c5e037 am: f0065d66ac
Change-Id: Ic41b620c2872be9596fd08abb8ea0475dd97259c
2020-02-28 17:12:35 +00:00
Automerger Merge Worker
fd2ceee249 Merge "Generalize AutoHideController to be shared" into rvc-dev am: dfb1fe98af am: ddf2e56a2f
Change-Id: Ia137bd58d17760a8f5f11ca50fdf243e5b8e244e
2020-02-28 17:12:32 +00:00
Automerger Merge Worker
5f0ceb3a65 Merge "Generalize AutoHideController to be shared" into rvc-dev am: dfb1fe98af am: b1eec61c92
Change-Id: I58abc3fc85b10db06a78ab2f2779a55af7901d21
2020-02-28 17:12:15 +00:00
Automerger Merge Worker
45433b2559 [automerger skipped] Merge changes from topic "cp-networkscan-optimize" into rvc-dev am: 6c8486c771 am: 600d65a575 -s ours
am skip reason: Change-Id I1f279fadd8c543b845fce0f13dc62c1480757692 with SHA-1 c058cac051 is in history

Change-Id: I0766155c59199f23c4407f129ff5c512034eb4a5
2020-02-28 17:11:55 +00:00
Automerger Merge Worker
9831923188 [automerger skipped] Add Network Preference Bitmaps am: f4a9445a52 am: 708ca65f38 -s ours
am skip reason: Change-Id I25f41ad48eb4dc74c2cace80ccec4e1e954443f9 with SHA-1 f4a9445a52 is in history

Change-Id: I069e1481157abcc856ea290cacd47ca725cfec83
2020-02-28 17:11:52 +00:00
Automerger Merge Worker
f1a6a57096 Merge changes from topic "am-46ca6038f66d49b4807b268dd241ea1f" into rvc-d1-dev-plus-aosp
* changes:
  Merge changes from topic "cp-networkscan-optimize" into rvc-dev am: 6c8486c771 am: ce6618e8b7
  Add Network Preference Bitmaps am: f4a9445a52 am: b7b6643c68
2020-02-28 17:11:33 +00:00
Automerger Merge Worker
c306d00ad8 Merge changes from topic "cp-networkscan-optimize" into rvc-dev am: 6c8486c771 am: ce6618e8b7
Change-Id: Ib981047d0898a850b348af9ae16f67caccd59a36
2020-02-28 17:11:27 +00:00
Automerger Merge Worker
ea4db2f31c Add Network Preference Bitmaps am: f4a9445a52 am: b7b6643c68
Change-Id: I4de9fe77d6b31806687a0e0d0c3e5002f29d1da9
2020-02-28 17:11:25 +00:00
Automerger Merge Worker
62bdbda3d8 Merge "Updates destination bounds upon rotation change" into rvc-dev am: bfdc669666 am: 78f7b6be3f
Change-Id: Icb2f49eb7f53bf0b6a06e98125902c4579231493
2020-02-28 17:11:18 +00:00
Automerger Merge Worker
084c614d64 Merge "Fixed the GMM PiP window size" into rvc-dev am: 1a7d51051e am: c22e079ba9
Change-Id: I6881dffd9281096ce39686a1834c424da6490cfc
2020-02-28 17:10:51 +00:00
Automerger Merge Worker
f7e57d6d15 Merge "Merge "Updates destination bounds upon rotation change" into rvc-dev am: bfdc669666 am: fb92fcce62" into rvc-d1-dev-plus-aosp 2020-02-28 17:10:32 +00:00
Automerger Merge Worker
f3b5f6d283 Merge "Updates destination bounds upon rotation change" into rvc-dev am: bfdc669666 am: fb92fcce62
Change-Id: I275a64a2494aa7358514e4ac0b8f0fd111650d6f
2020-02-28 17:10:26 +00:00
Automerger Merge Worker
e840091bae Merge "Ignore flaky test" into rvc-dev am: b94fdf54c2 am: 64f1721b48
Change-Id: I6256f33d7229d6dd80d70e87f82eb058e0f6a7e1
2020-02-28 17:10:25 +00:00
Automerger Merge Worker
875e32bf39 Merge "Fixed the GMM PiP window size" into rvc-dev am: 1a7d51051e am: a79d59c2d0
Change-Id: I716c98d5473cd7df8676b1d32ba1cf35116a31a9
2020-02-28 17:10:17 +00:00
Automerger Merge Worker
253c57568f Merge "Ignore flaky test" into rvc-dev am: b94fdf54c2 am: a108e00206
Change-Id: I13b3c36ad9447bd045e6ebe6a041047fc54b29b0
2020-02-28 17:10:07 +00:00
Automerger Merge Worker
425ca93883 Merge "Battery saver dark mode bug" into rvc-dev am: b86cf15c28
Change-Id: I98b0171e3cfb4a0c7f44564d7d7ea27075a57ee9
2020-02-28 17:10:02 +00:00
Automerger Merge Worker
b09e86b45f Merge "Battery saver dark mode bug" into rvc-dev am: b86cf15c28
Change-Id: I546bc8bac1cd882a811a8a97dff072fb206c2a8b
2020-02-28 17:02:17 +00:00
Automerger Merge Worker
f0065d66ac Merge "Fix Sharesheet grid items not aligned issue" into rvc-dev am: d113c5e037
Change-Id: I2a398fdb733482fe8c1b53e1f0f9035946e91312
2020-02-28 17:01:41 +00:00