François Gaffie
246cde18c4
[automerger skipped] AudioSystem: add annotation on API used by CTS media am: adcbf9004a am: f8709ba43c -s ours am: 3dbf9b234c -s ours
...
am skip reason: Change-Id Iff9abda2cf971d9c234dcf7df7c2b9a4ad5294c3 with SHA-1 d83e946d53
2020-04-07 22:16:19 +00:00
Evan Rosky
e4e3b624e4
Merge "Remove some more dead-code from old split impl" into rvc-dev am: e68c8ac02b am: 42f14d5442
...
Change-Id: I088877dcec22d6900ef7b228905997be177facb5
2020-04-07 22:15:42 +00:00
Automerger Merge Worker
88c23fecfc
Merge "Merge "MediaMetrics: Add typed property keys" into rvc-dev am: cead18a318 am: 4ffc3ef00a" into rvc-d1-dev-plus-aosp
2020-04-07 22:15:39 +00:00
Andy Hung
07287ef1d7
Merge "MediaMetrics: Add typed property keys" into rvc-dev am: cead18a318 am: 4ffc3ef00a
...
Change-Id: I69084ac485ddbf164e5606ef89554e475ed0e81d
2020-04-07 22:15:35 +00:00
Evan Rosky
9febd5a20c
Merge "Remove some more dead-code from old split impl" into rvc-dev am: e68c8ac02b am: c8b8ac2599
...
Change-Id: I3ab49e01089c5fbd05d69370fd49acbbfa177f20
2020-04-07 22:15:25 +00:00
Andy Hung
7f251ff523
Merge "MediaMetrics: Add typed property keys" into rvc-dev am: cead18a318 am: 4aea18e7a3
...
Change-Id: Ieca3d0050743986cafaf7aa7dcf97c561f17a679
2020-04-07 22:15:04 +00:00
François Gaffie
3dbf9b234c
[automerger skipped] AudioSystem: add annotation on API used by CTS media am: adcbf9004a am: f8709ba43c -s ours
...
am skip reason: Change-Id Iff9abda2cf971d9c234dcf7df7c2b9a4ad5294c3 with SHA-1 d83e946d53
2020-04-07 22:11:57 +00:00
Evan Rosky
42f14d5442
Merge "Remove some more dead-code from old split impl" into rvc-dev am: e68c8ac02b
...
Change-Id: I98416e5ae2a7e74ae41b0186e614ba6e44252b02
2020-04-07 22:02:09 +00:00
Evan Rosky
c8b8ac2599
Merge "Remove some more dead-code from old split impl" into rvc-dev am: e68c8ac02b
...
Change-Id: Ifcf8c59c7b06f7b4c408350cd29863361d64de0e
2020-04-07 22:01:48 +00:00
Andy Hung
4ffc3ef00a
Merge "MediaMetrics: Add typed property keys" into rvc-dev am: cead18a318
...
Change-Id: I9216637546e574e063ac392db9ec1be7c01e272b
2020-04-07 22:01:00 +00:00
Andy Hung
4aea18e7a3
Merge "MediaMetrics: Add typed property keys" into rvc-dev am: cead18a318
...
Change-Id: Ibc6300b44da27d133ca5649fdc35bce5be9f2935
2020-04-07 22:00:58 +00:00
Evan Rosky
e68c8ac02b
Merge "Remove some more dead-code from old split impl" into rvc-dev
2020-04-07 21:47:44 +00:00
Andy Hung
cead18a318
Merge "MediaMetrics: Add typed property keys" into rvc-dev
2020-04-07 21:47:20 +00:00
François Gaffie
f8709ba43c
AudioSystem: add annotation on API used by CTS media am: adcbf9004a
...
Change-Id: I8d1bd14512bff6b3abbc3fe57068d3caa99c3920
2020-04-07 21:35:08 +00:00
TreeHugger Robot
e1eb0a4334
Merge "Remove StateProvider from LockIcon" into rvc-dev am: 645fdff012 am: ad1fa68611
...
Change-Id: Ib6bbe589a77fca5be407afbfcd6e1dbd4e0ddf5a
2020-04-07 21:22:13 +00:00
TreeHugger Robot
2a72f8908a
Merge "Remove StateProvider from LockIcon" into rvc-dev am: 645fdff012 am: d0fb4cf2ad
...
Change-Id: Ia5945856063a4fe1c75583f2e7703cf121846412
2020-04-07 21:15:26 +00:00
TreeHugger Robot
ad1fa68611
Merge "Remove StateProvider from LockIcon" into rvc-dev am: 645fdff012
...
Change-Id: Iba92357254d4d3ce6716652863b7329157f545f4
2020-04-07 21:01:49 +00:00
TreeHugger Robot
d0fb4cf2ad
Merge "Remove StateProvider from LockIcon" into rvc-dev am: 645fdff012
...
Change-Id: I21fd898a553b3eed6e809b3616cc906ea15d827d
2020-04-07 21:00:34 +00:00
Automerger Merge Worker
d335fd3f32
Merge "Merge "Guard against NPE" into rvc-dev am: 54225dfc65 am: 0595a58503" into rvc-d1-dev-plus-aosp
2020-04-07 20:19:16 +00:00
TreeHugger Robot
9298f26aea
Merge "Guard against NPE" into rvc-dev am: 54225dfc65 am: 0595a58503
...
Change-Id: Ibb27ffdf2c97f82638e236342f40002806f350d4
2020-04-07 20:19:04 +00:00
TreeHugger Robot
92bc38b46d
Merge "Guard against NPE" into rvc-dev am: 54225dfc65 am: bc51daca40
...
Change-Id: Ic4b489bc7b24fb2471c88899c95fa9408c516df1
2020-04-07 20:19:03 +00:00
TreeHugger Robot
645fdff012
Merge "Remove StateProvider from LockIcon" into rvc-dev
2020-04-07 20:14:31 +00:00
TreeHugger Robot
0595a58503
Merge "Guard against NPE" into rvc-dev am: 54225dfc65
...
Change-Id: I73c40d9c7bbe6f891736461921a03b6292d44bf9
2020-04-07 20:05:13 +00:00
TreeHugger Robot
bc51daca40
Merge "Guard against NPE" into rvc-dev am: 54225dfc65
...
Change-Id: If80ba637ab99f2c298865bce7c4317adb46d6f7d
2020-04-07 20:05:01 +00:00
TreeHugger Robot
54225dfc65
Merge "Guard against NPE" into rvc-dev
2020-04-07 19:55:29 +00:00
Santiago Seifert
4583c58bda
Merge "Rephrase NonNull javadoc to make it more generic" into rvc-dev am: 995870accd am: 56cb5bf9f6
...
Change-Id: Idcddf2397ddb62dbddc3e4eb33a4645a46042a8d
2020-04-07 19:40:56 +00:00
Automerger Merge Worker
e4eebd0e08
Merge "Merge "Rephrase NonNull javadoc to make it more generic" into rvc-dev am: 995870accd am: 7ebc330848" into rvc-d1-dev-plus-aosp
2020-04-07 19:40:49 +00:00
Tiger Huang
3bfe429398
Merge "Add logic to handle cases that IME is already shown" into rvc-dev am: b1cd7d54a1 am: da90e67009
...
Change-Id: Id9a58d8b92a59efbe6a2f8a982e76015d25e0c9c
2020-04-07 19:40:36 +00:00
Santiago Seifert
160d700424
Merge "Rephrase NonNull javadoc to make it more generic" into rvc-dev am: 995870accd am: 7ebc330848
...
Change-Id: I9d973c7ad7f89e7f35053fb80f0f171acd5f5c3c
2020-04-07 19:40:35 +00:00
Santiago Seifert
7ebc330848
Merge "Rephrase NonNull javadoc to make it more generic" into rvc-dev am: 995870accd
...
Change-Id: Iea37b14ba6397c5519b89f7a835eafe6f31eb8d3
2020-04-07 19:34:58 +00:00
Santiago Seifert
56cb5bf9f6
Merge "Rephrase NonNull javadoc to make it more generic" into rvc-dev am: 995870accd
...
Change-Id: I6a145afa06cb451838885afb6f8d382b40f86195
2020-04-07 19:34:54 +00:00
Santiago Seifert
995870accd
Merge "Rephrase NonNull javadoc to make it more generic" into rvc-dev
2020-04-07 19:32:21 +00:00
Tiger Huang
8c54f27cc4
Merge "Add logic to handle cases that IME is already shown" into rvc-dev am: b1cd7d54a1 am: e2704a7471
...
Change-Id: I787a35a06d421189300bc0fb34456e5567b0d0bd
2020-04-07 19:29:55 +00:00
Treehugger Robot
f8ffd510bd
[automerger skipped] Merge "[AudioServer] Fix CTS for volume groups based on non public streams" am: 99f24661cb am: 9c542555fe -s ours am: 8889ca330e -s ours
...
am skip reason: Change-Id I53d9d2d4d7591300bf364d591412b548356cd118 with SHA-1 bb58b4e684
2020-04-07 19:29:41 +00:00
Chris Tate
d5d6b581b7
[automerger skipped] Merge "Verify all possible hosts that match web nav" into oc-dev am: 0d01b03776 am: 6da62f7e0e -s ours am: e3f2048ffc -s ours am: 246360bf4f -s ours am: f562ffc53e -s ours am: 5a9674e3ac -s ours am: 4cbb22353a -s ours am: e5e8be2a6c -s ours
...
am skip reason: Change-Id If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a with SHA-1 d04ec018d5
2020-04-07 19:29:11 +00:00
Tiger Huang
e2704a7471
Merge "Add logic to handle cases that IME is already shown" into rvc-dev am: b1cd7d54a1
...
Change-Id: If29807a28fa1c87d02dc0830c80df7acd5132cb7
2020-04-07 19:28:21 +00:00
Tiger Huang
da90e67009
Merge "Add logic to handle cases that IME is already shown" into rvc-dev am: b1cd7d54a1
...
Change-Id: I7071b0aa524e014c4ae5b8104daecbd1c52495d6
2020-04-07 19:28:18 +00:00
Chris Tate
7cdaf75aec
[automerger skipped] Merge "Verify all possible hosts that match web nav" into oc-dev am: 0d01b03776 am: 6da62f7e0e -s ours am: e3f2048ffc -s ours am: 246360bf4f -s ours am: f562ffc53e -s ours am: 5a9674e3ac -s ours am: 4cbb22353a -s ours am: e65c68812f -s ours
...
am skip reason: Change-Id If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a with SHA-1 d04ec018d5
2020-04-07 19:23:01 +00:00
Tiger Huang
b1cd7d54a1
Merge "Add logic to handle cases that IME is already shown" into rvc-dev
2020-04-07 19:19:29 +00:00
Treehugger Robot
8889ca330e
[automerger skipped] Merge "[AudioServer] Fix CTS for volume groups based on non public streams" am: 99f24661cb am: 9c542555fe -s ours
...
am skip reason: Change-Id I53d9d2d4d7591300bf364d591412b548356cd118 with SHA-1 bb58b4e684
2020-04-07 19:16:36 +00:00
Chris Tate
e5e8be2a6c
[automerger skipped] Merge "Verify all possible hosts that match web nav" into oc-dev am: 0d01b03776 am: 6da62f7e0e -s ours am: e3f2048ffc -s ours am: 246360bf4f -s ours am: f562ffc53e -s ours am: 5a9674e3ac -s ours am: 4cbb22353a -s ours
...
am skip reason: Change-Id If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a with SHA-1 d04ec018d5
2020-04-07 19:09:40 +00:00
Chris Tate
e65c68812f
[automerger skipped] Merge "Verify all possible hosts that match web nav" into oc-dev am: 0d01b03776 am: 6da62f7e0e -s ours am: e3f2048ffc -s ours am: 246360bf4f -s ours am: f562ffc53e -s ours am: 5a9674e3ac -s ours am: 4cbb22353a -s ours
...
am skip reason: Change-Id If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a with SHA-1 d04ec018d5
2020-04-07 19:09:39 +00:00
Treehugger Robot
9c542555fe
Merge "[AudioServer] Fix CTS for volume groups based on non public streams" am: 99f24661cb
...
Change-Id: Ic02cb59211ecd78c73ba5d5f6105d697a22af2ec
2020-04-07 19:04:30 +00:00
Dave Mankoff
9d892e4eba
Remove StateProvider from LockIcon
...
Whenever the state changes in the system, we now push that information
directly to the LockIcon, instead of pushing what we think the prior
state was and letting it query for the current state. This allows
the LockIcon to properly track what _it_ thinks the old state was
(when it last changed its icon) and then react accordingly.
This has the added benefit of being easier to understand with
less code.
Fixes: 153117689
Test: atest SystemUITests && Manual
Change-Id: I8f2e3e1d2287b26ca44b7eb6df8de392efd4bb2a
2020-04-07 15:01:13 -04:00
Chris Tate
4cbb22353a
[automerger skipped] Merge "Verify all possible hosts that match web nav" into oc-dev am: 0d01b03776 am: 6da62f7e0e -s ours am: e3f2048ffc -s ours am: 246360bf4f -s ours am: f562ffc53e -s ours am: 5a9674e3ac -s ours
...
am skip reason: Change-Id If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a with SHA-1 d04ec018d5
2020-04-07 18:58:09 +00:00
Treehugger Robot
99f24661cb
Merge "[AudioServer] Fix CTS for volume groups based on non public streams"
2020-04-07 18:51:25 +00:00
Calin Juravle
15f61c6bcb
Merge changes from topic "server-reporting" into rvc-dev am: 11bdb5dfb4 am: b32e288a18
...
Change-Id: I778257144917c3cc5d09efdb3787c5a6cc0ba81c
2020-04-07 18:47:32 +00:00
TreeHugger Robot
3160a103be
Merge "Fixed an issue where the unread count would disappear too fast" into rvc-dev am: f9557e4400 am: 9cb021867e
...
Change-Id: I3a4484381ac5ae0456cd4c212a41efae8e200505
2020-04-07 18:47:18 +00:00
Calin Juravle
976a62da2f
Merge changes from topic "server-reporting" into rvc-dev am: 11bdb5dfb4 am: 9867e0b6c3
...
Change-Id: Ie26a18de14d1454b95218b85f296b0dd5f44ac5c
2020-04-07 18:46:59 +00:00
Calin Juravle
9867e0b6c3
Merge changes from topic "server-reporting" into rvc-dev am: 11bdb5dfb4
...
Change-Id: I3fda3465d0be8f235c9e8a2391f68bc441724c13
2020-04-07 18:46:32 +00:00
