Steven Moreland
c2af792f98
Merge "HwBinder: don't rely on kernel headers." am: b0e6033182
...
am: 1201b1b438
2019-09-17 15:04:53 -07:00
Steven Moreland
1201b1b438
Merge "HwBinder: don't rely on kernel headers."
...
am: b0e6033182
2019-09-17 14:58:30 -07:00
Steven Moreland
b0e6033182
Merge "HwBinder: don't rely on kernel headers."
2019-09-17 21:49:31 +00:00
Kevin Hufnagle
b8f9986a1c
Merge "docs: Fixed contradictory info in IntentFilter" into qt-dev am: 1fe99017eb
...
am: 1e8492c744
2019-09-17 12:32:09 -07:00
Kevin Hufnagle
1e8492c744
Merge "docs: Fixed contradictory info in IntentFilter" into qt-dev
...
am: 1fe99017eb
2019-09-17 12:19:12 -07:00
Kevin Hufnagle
1fe99017eb
Merge "docs: Fixed contradictory info in IntentFilter" into qt-dev
2019-09-17 18:54:20 +00:00
Amit Mahajan
fd8765b95e
Merge "Fix descriptions for default SIM in global preferences" am: eeeb74a093
...
am: f87866ba9f
2019-09-17 10:43:02 -07:00
Amit Mahajan
f87866ba9f
Merge "Fix descriptions for default SIM in global preferences"
...
am: eeeb74a093
2019-09-17 10:31:23 -07:00
Amit Mahajan
eeeb74a093
Merge "Fix descriptions for default SIM in global preferences"
2019-09-17 17:18:04 +00:00
Christopher Ferris
bf6df9ed52
Merge "Use bionic platform headers." am: 539d37679c
...
am: 36469ac071
2019-09-17 10:01:44 -07:00
Christopher Ferris
36469ac071
Merge "Use bionic platform headers."
...
am: 539d37679c
2019-09-17 09:50:51 -07:00
Christopher Ferris
539d37679c
Merge "Use bionic platform headers."
2019-09-17 16:33:25 +00:00
Taesu Lee
0399854df0
Fix descriptions for default SIM in global preferences
...
Test: Not required.
Change-Id: I7f32eb495b53d13aba50b07d86e63f0549e9e6bb
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com >
2019-09-17 13:45:54 +09:00
Yifan Hong
6479d51ebb
Merge "VintfObject: Fix getHalNamesAndVersions doc" am: bc45ac13ef
...
am: c109452058
2019-09-16 17:38:00 -07:00
Yifan Hong
c109452058
Merge "VintfObject: Fix getHalNamesAndVersions doc"
...
am: bc45ac13ef
2019-09-16 17:19:58 -07:00
Yifan Hong
bc45ac13ef
Merge "VintfObject: Fix getHalNamesAndVersions doc"
2019-09-16 23:58:51 +00:00
Joshua Tsuji
e527f95160
Merge "Ignore physics animation tests that have suddenly become flaky." am: 7529e67a80
...
am: 829ba3dd6c
2019-09-16 15:12:17 -07:00
Jordan Liu
4fdf765e76
Merge "Add carrier config KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_BOOL" am: be83f253f4
...
am: 6671633935
2019-09-16 15:02:34 -07:00
Joshua Tsuji
829ba3dd6c
Merge "Ignore physics animation tests that have suddenly become flaky."
...
am: 7529e67a80
2019-09-16 14:55:31 -07:00
Jordan Liu
6671633935
Merge "Add carrier config KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_BOOL"
...
am: be83f253f4
2019-09-16 14:49:49 -07:00
Treehugger Robot
7529e67a80
Merge "Ignore physics animation tests that have suddenly become flaky."
2019-09-16 21:32:43 +00:00
Jean-Michel Trivi
784faabf21
Merge "AudioService: fix missing CEC message on unmute after vol down" am: 4f86011710
...
am: 1d99b3aaa8
2019-09-16 14:29:07 -07:00
Jordan Liu
be83f253f4
Merge "Add carrier config KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_BOOL"
2019-09-16 21:28:03 +00:00
Jean-Michel Trivi
1d99b3aaa8
Merge "AudioService: fix missing CEC message on unmute after vol down"
...
am: 4f86011710
2019-09-16 14:17:54 -07:00
Jean-Michel Trivi
4f86011710
Merge "AudioService: fix missing CEC message on unmute after vol down"
2019-09-16 21:04:08 +00:00
Joshua Tsuji
c5fab4172a
Ignore physics animation tests that have suddenly become flaky.
...
Test: atest SystemUITests
Change-Id: Ia15f767fdb251338a7e7b15be7836b6928e48ba5
Merged-In: Ia15f767fdb251338a7e7b15be7836b6928e48ba5
(cherry picked from commit 2b991d91c6
2019-09-16 19:55:35 +00:00
Christopher Ferris
15c0233afe
Use bionic platform headers.
...
Bug: 130763340
Test: Builds.
Change-Id: Ieed72d4e15c0ce0dfc3a4f3383ea6563905bc236
Merged-In: Ieed72d4e15c0ce0dfc3a4f3383ea6563905bc236
(cherry picked from commit 8269f3a377
2019-09-16 12:44:35 -07:00
Adam Seaton
a824053914
Merge "Revert "don't compute outside of visible range"" into qt-dev am: e4d9618d67
...
am: 3d623d54f2
2019-09-14 05:48:11 -07:00
Adam Seaton
3d623d54f2
Merge "Revert "don't compute outside of visible range"" into qt-dev
...
am: e4d9618d67
2019-09-14 05:28:23 -07:00
TreeHugger Robot
e4d9618d67
Merge "Revert "don't compute outside of visible range"" into qt-dev
2019-09-14 12:10:43 +00:00
Adam Seaton
b4583e4dcd
Revert "don't compute outside of visible range"
...
bug:141016653
This reverts commit 0a57fe099ahttps://b.corp.google.com/issues/141016653
Change-Id: I39954226cb8971ee17e367692b3fd0e29871ad48
2019-09-13 22:09:30 +00:00
Andy Hung
e1ea2d25b5
Merge "SoundPool: Do not sleep on stop for USAGE_GAME or on BUFFER_END" am: 763cb4638a
...
am: a52acaf833
2019-09-13 14:37:04 -07:00
Andy Hung
a52acaf833
Merge "SoundPool: Do not sleep on stop for USAGE_GAME or on BUFFER_END"
...
am: 763cb4638a
2019-09-13 14:29:40 -07:00
Andy Hung
763cb4638a
Merge "SoundPool: Do not sleep on stop for USAGE_GAME or on BUFFER_END"
2019-09-13 21:18:56 +00:00
Shuo Qian
ab29db9236
Merge "Listeners of active emergency numbers" am: 7674b345a9
...
am: fc225eab6b
2019-09-13 13:37:45 -07:00
Shuo Qian
fc225eab6b
Merge "Listeners of active emergency numbers"
...
am: 7674b345a9
2019-09-13 13:24:42 -07:00
Shuo Qian
7674b345a9
Merge "Listeners of active emergency numbers"
2019-09-13 19:50:16 +00:00
Luca Stefani
f1545ec084
Merge "WindowOrientationListener: Check if proposed rotation is in range" am: eb97eab212
...
am: f40968bc1f
2019-09-13 12:23:43 -07:00
Luca Stefani
f40968bc1f
Merge "WindowOrientationListener: Check if proposed rotation is in range"
...
am: eb97eab212
2019-09-13 12:12:47 -07:00
Treehugger Robot
eb97eab212
Merge "WindowOrientationListener: Check if proposed rotation is in range"
2019-09-13 18:57:50 +00:00
Jean-Michel Trivi
91f9b5cc6f
AudioService: fix missing CEC message on unmute after vol down
...
Group in one method sending volume / mute updates to HDMI CEC
when applicable. Use this method, maybeSendSystemAudioStatusCommand,
to avoid code duplication.
Add missing synchronization in onUnmuteStream for stream mute check.
When STREAM_MUSIC is unmuted, also call
maybeSendSystemAudioStatusCommand for a mute adjust, to ensure
other CEC devices' UI is in sync with the internal state.
Bug: 136977965
Test: with ATV device in system audio mode, mute with remote, then \
press vol down on TV remote, verify TV display matches ATV UI \
with current volume.
Change-Id: I279a97871ba98e67f282bf148969ba41ed3f6062
2019-09-13 10:54:48 -07:00
Kweku Adams
fe1bf5d3fb
Merge "Fix QuotaController constants." am: 4017f8be2f
...
am: 29a7524bdd
2019-09-13 10:52:40 -07:00
Tao Bao
d4897c7dbf
Merge "Add nullability anotations" am: 7e3b406f26
...
am: 8123e5cc50
2019-09-13 10:41:54 -07:00
Madhava Srinivasan
0e7175db88
Merge "Honor HDMI_CONTROL_ENABLED setting in AudioService" am: 4efb0c510d
...
am: a40f432ac6
2019-09-13 10:38:05 -07:00
Tobias Thierer
63522e8f02
Merge "Check FIPS_mode() rather than explicitly calling BORINGSSL_self_test." am: 414d53442e
...
am: 80809d6d5a
2019-09-13 10:33:02 -07:00
Kweku Adams
29a7524bdd
Merge "Fix QuotaController constants."
...
am: 4017f8be2f
2019-09-13 10:31:30 -07:00
Andy Hung
f1588f2694
SoundPool: Do not sleep on stop for USAGE_GAME or on BUFFER_END
...
Test: SoundPoolApplication, SoundPoolOggTest, Games
Bug: 139787914
Bug: 139788416
Bug: 140579743
Bug: 140779732
Merged-In: I83b9b1d61b65dcc4a73d676e1f8be1e022c70302
Change-Id: I83b9b1d61b65dcc4a73d676e1f8be1e022c70302
(cherry picked from commit a527524356
2019-09-13 10:30:02 -07:00
Tao Bao
8123e5cc50
Merge "Add nullability anotations"
...
am: 7e3b406f26
2019-09-13 10:28:21 -07:00
Madhava Srinivasan
a40f432ac6
Merge "Honor HDMI_CONTROL_ENABLED setting in AudioService"
...
am: 4efb0c510d
2019-09-13 10:24:22 -07:00
Tobias Thierer
80809d6d5a
Merge "Check FIPS_mode() rather than explicitly calling BORINGSSL_self_test."
...
am: 414d53442e
2019-09-13 10:18:42 -07:00
