Jean-Michel Trivi
6df797ed86
AudioService: more stringent on dropping ACTION_AUDIO_BECOMING_NOISY am: c1adecd66a
...
am: 5a2f0790ab
Change-Id: Id0495d0533be72276167a6af010cfc0ab91c3d7a
2019-04-15 12:22:06 -07:00
Jakub Pawlowski
e1eeabdbf6
[automerger skipped] Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull" into qt-dev am: f98ada2290 -s ours
...
am: 1e577c1ce5 -s ours
am skip reason: change_id I5f895d65a7036275ab0faa0afd2ee1eebc416476 with SHA1 64307cc0b2 is in history
Change-Id: I777456067e4fbf1cdbd9d069a0c3488dcfd2a150
2019-04-15 12:16:00 -07:00
David Anderson
486720e8ac
[automerger skipped] Merge "Load /metadata/password_slots/slot_map lazily." into qt-dev am: 9a73912aec
...
am: da439d4abb -s ours
am skip reason: change_id Ib2e0c05575d07496792188716b962ca622df28e6 with SHA1 f55f5d83de is in history
Change-Id: I25d958a9a511bb145f372f7c6b4d1cfa379456af
2019-04-15 12:03:54 -07:00
Jean-Michel Trivi
5a2f0790ab
AudioService: more stringent on dropping ACTION_AUDIO_BECOMING_NOISY
...
am: c1adecd66a
Change-Id: Ie2a7f82f97605c4e3684cecb128ad64bf14b9dc3
2019-04-15 12:03:53 -07:00
John Reck
b10b60f04c
Merge "Support render-ahead in vulkan" into qt-dev am: 08ca2a2560
...
am: a2e9ec9f2e
Change-Id: Icca706c923c87278c0a9910dd1746272c0da3e3d
2019-04-15 11:57:00 -07:00
Jakub Pawlowski
1e577c1ce5
[automerger skipped] Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull" into qt-dev
...
am: f98ada2290 -s ours
am skip reason: change_id I5f895d65a7036275ab0faa0afd2ee1eebc416476 with SHA1 64307cc0b2 is in history
Change-Id: I40000c30cca0a169eb22fbd74ca3cff1f546bd05
2019-04-15 11:55:42 -07:00
Jean-Michel Trivi
c1adecd66a
AudioService: more stringent on dropping ACTION_AUDIO_BECOMING_NOISY
...
Drop ACTION_AUDIO_BECOMING_NOISY only when there is no more audio
focus users.
Bug: 129983099
Test: see bug
Change-Id: I899301754ba1506598b1be1cb5605bc3b53e3942
2019-04-15 18:49:01 +00:00
David Anderson
da439d4abb
Merge "Load /metadata/password_slots/slot_map lazily." into qt-dev
...
am: 9a73912aec
Change-Id: If816edbe0d27c107ae2ee7c42c4bea447ae43021
2019-04-15 11:47:39 -07:00
John Reck
a2e9ec9f2e
Merge "Support render-ahead in vulkan" into qt-dev
...
am: 08ca2a2560
Change-Id: I51ce1419820a0f984b52f2bbee18604ef39aed7f
2019-04-15 11:40:58 -07:00
Amy Zhang
4de7abf1f4
Merge "Resolve CEC related API requests from API Council" into qt-dev am: 64b51f91ff
...
am: 7a7ebecb9b
Change-Id: I2fc466ca79400faffd78eee543a15da63e638e2f
2019-04-15 11:38:24 -07:00
TreeHugger Robot
f98ada2290
Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull" into qt-dev
2019-04-15 18:38:14 +00:00
Neil Fuller
6ac2421d63
Merge "Switch ByteStringUtils over to HexEncoding impl" am: 6150065560 am: 42aacac8ad
...
am: d982160c6a
Change-Id: Ibc609623891b69c694fdbffa81ce59c90f3db8d6
2019-04-15 11:32:18 -07:00
David Anderson
9a73912aec
Merge "Load /metadata/password_slots/slot_map lazily." into qt-dev
2019-04-15 18:28:38 +00:00
Martijn Coenen
1ebe93e25a
Merge "Catch all exceptions when calling startCheckpoint()." into qt-dev am: ad6195dc40
...
am: 26b42aea01
Change-Id: If785f5803dc4449128cd1e0b51fb8d6a84701011
2019-04-15 11:23:11 -07:00
John Reck
08ca2a2560
Merge "Support render-ahead in vulkan" into qt-dev
2019-04-15 18:20:28 +00:00
Calvin Pan
28f2ead85b
Merge "Add NonNull in Carriers constant" into qt-dev am: c6a1bf1ac1
...
am: d0ad497e6c
Change-Id: I428ff623d46d3891b05882df5774343bfe3234c0
2019-04-15 11:12:18 -07:00
Amy Zhang
7a7ebecb9b
Merge "Resolve CEC related API requests from API Council" into qt-dev
...
am: 64b51f91ff
Change-Id: I8c9f89d3bd8c4124e4d09115684a02156e19e1fb
2019-04-15 11:05:06 -07:00
Kevin Chyn
3c3ff75442
Merge "Ensure strings are consistent with HIDL documentation" into qt-dev am: 6e77293d29
...
am: d3eb0ab9b5
Change-Id: I2353023fa6cecfb18d5520ce268b038ece681d07
2019-04-15 11:02:59 -07:00
Neil Fuller
d982160c6a
Merge "Switch ByteStringUtils over to HexEncoding impl" am: 6150065560
...
am: 42aacac8ad
Change-Id: Ic26eb802f39f1f86177a2de8e855573806e08998
2019-04-15 10:57:36 -07:00
Martijn Coenen
26b42aea01
Merge "Catch all exceptions when calling startCheckpoint()." into qt-dev
...
am: ad6195dc40
Change-Id: I92509dde4d0e00f36f435b4f0bba616c44f42ff5
2019-04-15 10:51:56 -07:00
Jean-Michel Trivi
a24f012fb9
Merge "AudioService: better vol adjustment logs" into qt-dev am: ddba88ea71
...
am: e11d6a5fb8
Change-Id: I97fb0be7aab267a2e0d34ddc31f51200497d92f4
2019-04-15 10:47:25 -07:00
Neil Fuller
42aacac8ad
Merge "Switch ByteStringUtils over to HexEncoding impl"
...
am: 6150065560
Change-Id: If57eb62d54b6c473051a560bf523819f0b971439
2019-04-15 10:47:04 -07:00
Amy Zhang
64b51f91ff
Merge "Resolve CEC related API requests from API Council" into qt-dev
2019-04-15 17:46:49 +00:00
Calvin Pan
d0ad497e6c
Merge "Add NonNull in Carriers constant" into qt-dev
...
am: c6a1bf1ac1
Change-Id: I6589938d50ca84c3d9eed43c358c791e5ed1cee2
2019-04-15 10:44:46 -07:00
Jean-Michel Trivi
fad78720ea
Merge "AudioPolicy: fix test API for focus policy" into qt-dev am: 848eab444c
...
am: 194d6fd230
Change-Id: I926e0ad67745a83ba06f6c87031ca2838ecf3a88
2019-04-15 10:40:10 -07:00
Martijn Coenen
ad6195dc40
Merge "Catch all exceptions when calling startCheckpoint()." into qt-dev
2019-04-15 17:38:08 +00:00
Kevin Chyn
d3eb0ab9b5
Merge "Ensure strings are consistent with HIDL documentation" into qt-dev
...
am: 6e77293d29
Change-Id: I9152d80ede71656932830818d3f27b31dca931e3
2019-04-15 10:34:35 -07:00
Calvin Pan
c6a1bf1ac1
Merge "Add NonNull in Carriers constant" into qt-dev
2019-04-15 17:33:37 +00:00
Neil Fuller
6150065560
Merge "Switch ByteStringUtils over to HexEncoding impl"
2019-04-15 17:30:35 +00:00
Jean-Michel Trivi
e11d6a5fb8
Merge "AudioService: better vol adjustment logs" into qt-dev
...
am: ddba88ea71
Change-Id: I9c57e4b7dc86947277caca9c550b2d1a08c2a51b
2019-04-15 10:24:48 -07:00
Fabian Kozynski
362efacb54
Merge "Fix tinting of battery percentage" into qt-dev am: c34f078f61
...
am: 6ee04ed0b7
Change-Id: I852f59db3a02df586098d5faa2f96ee59ee56c74
2019-04-15 10:19:21 -07:00
Jean-Michel Trivi
194d6fd230
Merge "AudioPolicy: fix test API for focus policy" into qt-dev
...
am: 848eab444c
Change-Id: I3e33fb238b1f410bbeb06f8d22f06149ad126501
2019-04-15 10:16:12 -07:00
Fabian Kozynski
6ee04ed0b7
Merge "Fix tinting of battery percentage" into qt-dev
...
am: c34f078f61
Change-Id: I1e1778605b7415e2360d80d51c09f3d7faa8a664
2019-04-15 10:05:36 -07:00
Kevin Rocard
84b0bfa7fa
Merge "Add getters to AudioPlaybackCaptureConfiguration" into qt-dev am: 4bea465dbb
...
am: 2ebde19cfa
Change-Id: I975cf26996648862c6e8c5955a5e850687d8bf95
2019-04-15 10:00:03 -07:00
Kevin Chyn
6e77293d29
Merge "Ensure strings are consistent with HIDL documentation" into qt-dev
2019-04-15 16:59:03 +00:00
Yunfan Chen
dacff763ed
Merge "Mark flaky pre-submit tests" into qt-dev am: 9cf5d50386
...
am: 6247ac6658
Change-Id: I0ebdf6ee99b1e95cb8c72cf782a10f30960ae501
2019-04-15 09:46:17 -07:00
Jean-Michel Trivi
ddba88ea71
Merge "AudioService: better vol adjustment logs" into qt-dev
2019-04-15 16:42:06 +00:00
Kevin Rocard
2ebde19cfa
Merge "Add getters to AudioPlaybackCaptureConfiguration" into qt-dev
...
am: 4bea465dbb
Change-Id: I3cb7f3b7667ac277a012ad9329bc2cb2c8fde1cc
2019-04-15 09:41:55 -07:00
Jean-Michel Trivi
848eab444c
Merge "AudioPolicy: fix test API for focus policy" into qt-dev
2019-04-15 16:38:09 +00:00
Fabian Kozynski
c34f078f61
Merge "Fix tinting of battery percentage" into qt-dev
2019-04-15 16:35:10 +00:00
Android Build Merger (Role)
d89ba63927
Merge "Merge "Add AudioManager.getAllowedCapturePolicy" into qt-dev am: acf6698f0c am: 71829af911"
2019-04-15 16:31:10 +00:00
Kevin Rocard
5345a3aec4
Merge "Add AudioManager.getAllowedCapturePolicy" into qt-dev am: acf6698f0c
...
am: 71829af911
Change-Id: I86a11415d0534d298d682c6453007bd12233fac7
2019-04-15 09:30:22 -07:00
Yunfan Chen
6247ac6658
Merge "Mark flaky pre-submit tests" into qt-dev
...
am: 9cf5d50386
Change-Id: Ib59cae49bf39ac271c3b8aa747a9c29d3fc31929
2019-04-15 09:28:46 -07:00
Neil Fuller
21a7591c58
Merge "Switch to HexEncoding from ByteStringUtils"
2019-04-15 16:23:16 +00:00
Kevin Rocard
71829af911
Merge "Add AudioManager.getAllowedCapturePolicy" into qt-dev
...
am: acf6698f0c
Change-Id: Ie8c1fc0052382d77ec9f4c9727c73cddfc0c3e1f
2019-04-15 09:17:00 -07:00
Kevin Rocard
4bea465dbb
Merge "Add getters to AudioPlaybackCaptureConfiguration" into qt-dev
2019-04-15 16:02:07 +00:00
Yunfan Chen
9cf5d50386
Merge "Mark flaky pre-submit tests" into qt-dev
2019-04-15 15:52:44 +00:00
TreeHugger Robot
acf6698f0c
Merge "Add AudioManager.getAllowedCapturePolicy" into qt-dev
2019-04-15 15:44:32 +00:00
Yohei Yukawa
dcd5379d9b
Fix '-u <user id>' handling in 'adb ime enable' and 'adb ime set' am: 3403f2d85e
...
am: e39528c4f7
Change-Id: I4c8678778cadc4fa26ea310a738f549435d4e48b
2019-04-15 08:43:14 -07:00
Yohei Yukawa
e39528c4f7
Fix '-u <user id>' handling in 'adb ime enable' and 'adb ime set'
...
am: 3403f2d85e
Change-Id: I78dda9e117a873bb2f02a6fad9fdf4ea4df6b546
2019-04-15 08:36:41 -07:00