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
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
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
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
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
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
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
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
Treehugger Robot
4017f8be2f
Merge "Fix QuotaController constants."
2019-09-13 17:14:40 +00:00
Tao Bao
7e3b406f26
Merge "Add nullability anotations"
2019-09-13 17:04:12 +00:00
Treehugger Robot
4efb0c510d
Merge "Honor HDMI_CONTROL_ENABLED setting in AudioService"
2019-09-13 16:58:19 +00:00
Tobias Thierer
414d53442e
Merge "Check FIPS_mode() rather than explicitly calling BORINGSSL_self_test."
2019-09-13 16:56:06 +00:00
Shuo Qian
e6f0e85516
Listeners of active emergency numbers
...
1) Introduce a new signature-level system permission allowing system apps to listen the
active emergency number, placed by calls or texts.
2) Add PhoneStateListener API surface to provide a mechanism to listen the
outgoing call emergency number or outgoing sms emergency number.
Bug: 135204580
Test: atest
Change-Id: I6e6bce6d4b97d492ca20302002911f9daa20767e
Merged-In: I6e6bce6d4b97d492ca20302002911f9daa20767e
(cherry picked from commit 7a1eb6d56b
2019-09-13 03:16:17 +00:00
Kweku Adams
24cbc741d5
Fix QuotaController constants.
...
1. QuotaController wasn't using the updated constants on system start.
It would only use the updated constants if they were changed after
system start.
2. Updating ACTIVE limits to more workable numbers.
Bug: 137166468
Test: atest com.android.server.job.controllers.QuotaControllerTest
Change-Id: I3e2848446b20f7258fac2d96566c96aea5715949
2019-09-12 18:43:45 -07:00
Madhava Srinivasan
154e0193ce
Honor HDMI_CONTROL_ENABLED setting in AudioService
...
This change updates how AudioService is updated of changes to Hdmi Cec
status (enable/disable) and availablity.
Bug: 138956107
Bug: 138373017
Test: Android TV STB: make; flashall;Volume -/+; HDMI control enable/disable.
Change-Id: Iaf83a45206be076858e13d113ba772ed5c59ef60
Merged-In: Iaf83a45206be076858e13d113ba772ed5c59ef60
2019-09-12 22:14:59 +00:00
Mathieu Chartier
e52e78ba8e
Merge "Remove android.permission.PermissionManager from blacklist"
...
am: cbc3d5d0ea
2019-09-12 11:36:07 -07:00
Mathieu Chartier
cbc3d5d0ea
Merge "Remove android.permission.PermissionManager from blacklist"
2019-09-12 18:20:14 +00:00
Mathieu Chartier
942300fa20
Remove android.permission.PermissionManager from blacklist
...
This is getting pulled in from somewhere, removing to fix
PreloadCheck test.
Bug: 140912480
Test: atest PreloadCheck
Change-Id: I8eea07930732865cc72fea0e352a1704d1c26118
2019-09-12 17:06:31 +00:00
Kyeongkab.Nam
77f1aac15d
Add nullability anotations
...
Add missing nullability for applyPayload.
Test: manual
Change-Id: Iafce9091767bd7a31937b0be329ede6639239d73
2019-09-12 11:33:39 +09:00
TreeHugger Robot
ad324a3d7e
Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master
2019-09-11 20:31:32 +00:00
Christian Wailes
80743ffc07
Merge "Revert "Revert "Remove a misleading "flush" function."""
...
am: d9bce3cfff
2019-09-11 12:04:10 -07:00
Colin Cross
89ee99a00d
Merge changes from topic "protobuf-3.9.1"
...
am: 2e928fb62a
2019-09-11 11:45:31 -07:00
Colin Cross
595bfb9b00
Adapt to google::protobuf::uint64 type change
...
am: f74defb808
2019-09-11 11:45:11 -07:00
Christian Wailes
d9bce3cfff
Merge "Revert "Revert "Remove a misleading "flush" function."""
2019-09-11 18:23:50 +00:00
Yifan Hong
0cdba3256c
VintfObject: Fix getHalNamesAndVersions doc
...
Test: CTS device info collect
Bug: 140832836
Change-Id: Iddc3c36d15370baa661e485b76c490a5d2b7815c
2019-09-11 11:07:43 -07:00
Colin Cross
2e928fb62a
Merge changes from topic "protobuf-3.9.1"
...
* changes:
Convert statsd_test and statsd_benchmark to proto lite
Adapt to google::protobuf::uint64 type change
2019-09-11 18:00:16 +00:00
Neil Fuller
c30eabfadb
Merge "Track changes to CountryTimeZones API"
...
am: 28b12c347c
2019-09-11 04:11:47 -07:00
Neil Fuller
28b12c347c
Merge "Track changes to CountryTimeZones API"
2019-09-11 10:58:38 +00:00
Siarhei Vishniakou
5cfc2c3e7f
Merge "Add uhid group to system_server"
...
am: 3a49014ca0
2019-09-11 02:55:39 -07:00
Treehugger Robot
3a49014ca0
Merge "Add uhid group to system_server"
2019-09-11 09:31:23 +00:00
Sama Lin
e10ec07a62
Merge "Swisscom VVM free SMS shortcodes CH"
...
am: 48dce552f0
2019-09-11 00:30:56 -07:00
Sama Lin
48dce552f0
Merge "Swisscom VVM free SMS shortcodes CH"
2019-09-11 07:06:26 +00:00
Steven Moreland
350e380ced
Merge "Remove libhwbinder/libhidltransport deps"
...
am: 32f968b767
2019-09-10 16:45:26 -07:00
Treehugger Robot
32f968b767
Merge "Remove libhwbinder/libhidltransport deps"
2019-09-10 23:36:54 +00:00
