Commit Graph

376763 Commits

Author SHA1 Message Date
Hall Liu
bbaf7644b2 Merge "Add new carrier configs for RTT"
am: c6b2c9df68

Change-Id: I353d63a70d36cbac54ae0af826934409a6d67093
2018-10-17 17:11:11 -07:00
Chenbo Feng
fd21f537af Merge "Move bpf project to system/bpf"
am: 1006d271cc

Change-Id: I0a96a2abd66fd0cca4b49d773a6990a59134128a
2018-10-17 13:55:43 -07:00
Jean-Michel Trivi
fe98e19565 [automerger skipped] Merge "AudioService: history of A2DP commands"
am: 95a384daf7  -s ours

Change-Id: I4406df349e37f025187c35c05b8d59ced132a0d7
2018-10-17 13:51:17 -07:00
Hall Liu
c6b2c9df68 Merge "Add new carrier configs for RTT" 2018-10-17 19:58:53 +00:00
Treehugger Robot
1006d271cc Merge "Move bpf project to system/bpf" 2018-10-17 19:39:39 +00:00
Jack Yu
405ea01c54 Merge "Supported v1.3 data profile"
am: 1e4f6fbe23

Change-Id: Ib7292e5de8ff39879244e4922412287c9f4ce9ab
2018-10-17 10:44:06 -07:00
Treehugger Robot
95a384daf7 Merge "AudioService: history of A2DP commands" 2018-10-17 17:43:07 +00:00
Mathew Inwood
3ffa1cad11 Merge "Merge hidden API metadata into a single CSV file."
am: 5037a7eb93

Change-Id: I0efce89576b0ca7ae90d49de3455466a866521de
2018-10-17 10:35:39 -07:00
Jack Yu
1e4f6fbe23 Merge "Supported v1.3 data profile" 2018-10-17 15:56:41 +00:00
Stanley Tng
f093798a61 resolve merge conflicts of 23ccecc4ca to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5fbdb4b246cc34ac5c6fcfe39e41a16137e9f9ab
Merged-In: Id2dc364dfa815e72db91b92bcee9745e6c40d34a
Merged-In: Ia9df6facd99ae91ebb4a819f61ea27551ce35efe
2018-10-17 08:33:56 -07:00
Mathew Inwood
5037a7eb93 Merge "Merge hidden API metadata into a single CSV file." 2018-10-17 09:20:04 +00:00
Jean-Michel Trivi
9d7c28f440 AudioService: history of A2DP commands
Keep history of command coming from A2dpService in AudioService
  logger.

Bug: 110186160
Test: connect/disconnect A2DP device and take bugreport,
      or run $ adb shell dumpsys audio

Change-Id: Ice65c20e91aa2675fbacb1c326a53d5b02bba3e5
(cherry picked from commit 3bf75781ca)
Merged-In: Ice65c20e91aa2675fbacb1c326a53d5b02bba3e5
2018-10-17 05:49:08 +00:00
Chen Xu
acbcff9e7d Merge "refactor radioPowerstate"
am: 354fc35005

Change-Id: I964beaa764a9c49b462167a9192ac03d3049d0a9
2018-10-16 21:54:53 -07:00
Treehugger Robot
23ccecc4ca Merge "Fix Connect State message in Device details for Hearing Aids" 2018-10-17 04:48:36 +00:00
Chen Xu
354fc35005 Merge "refactor radioPowerstate" 2018-10-17 04:10:47 +00:00
Chenbo Feng
5bb4fea967 Move bpf project to system/bpf
The bpf project now have a new project directory in system/bpf instead
of inside netd. The network related bpf library is renamed to
libnetdbpf. Fix the dependency issue in framework to make sure no
regression.

Test: -m CtsNetTestCases -t android.net.cts.TrafficStatsTest
Bug: 112334572
Change-Id: Ibd477bf17d18d516aa520fb1569f4a395ef9abf0
2018-10-17 03:46:35 +00:00
Igor Murashkin
cbe655e781 Merge "iorap: Remove blank newline in TEST_MAPPING"
am: 22fe21df93

Change-Id: Id1b72f79c242f827ff04acd0deff2c4c9d4fe65d
2018-10-16 20:45:53 -07:00
Treehugger Robot
22fe21df93 Merge "iorap: Remove blank newline in TEST_MAPPING" 2018-10-17 01:50:35 +00:00
Shuo Qian
a781751b32 Merge "Make SubscriptionManager.getSlotIndex public"
am: 719310cd2c

Change-Id: Ia942ecfefef8f26ff0b1f140c0692c81aebd11fa
2018-10-16 17:54:52 -07:00
Dan Willemsen
9b767e275e Merge "Stop using DIST_DIR directly, use dist-for-goals instead"
am: a8f2601d28

Change-Id: Iabb2ddb086dda71887c3d50152db50f813c9556a
2018-10-16 17:43:35 -07:00
Shuo Qian
719310cd2c Merge "Make SubscriptionManager.getSlotIndex public" 2018-10-17 00:37:35 +00:00
Treehugger Robot
a8f2601d28 Merge "Stop using DIST_DIR directly, use dist-for-goals instead" 2018-10-17 00:18:07 +00:00
Eric Laurent
6466847321 [automerger skipped] Merge "audioservice: fix a2dp connection race condition"
am: e568805209  -s ours

Change-Id: Ifbb5cc5a8422f73e2f2eb2236d3f2865e4553986
2018-10-16 17:11:33 -07:00
Treehugger Robot
e568805209 Merge "audioservice: fix a2dp connection race condition" 2018-10-16 23:49:35 +00:00
Igor Murashkin
ff3a8bf0f7 Merge "iorap: Add presubmit/postsubmit support"
am: 7cbabff3f0

Change-Id: I5f5afb05cde2894fb62728e67943a3dc38f26594
2018-10-16 15:51:19 -07:00
Eric Laurent
07f582189a audioservice: fix a2dp connection race condition
In case of fast (< 1 second) A2DP disconnect/connect sequence, there
is a potential race condition where the delayed disconnection message
(due to becoming noisy intent) is received after the not delayed
connection message.

- Make sure all messages related to device connection/disconnection
(including MSG_A2DP_DEVICE_CONFIG_CHANGE and MSG_BTA2DP_DOCK_TIMEOUT)
are handled by queueMsgUnderWakeLock().
- Make sure messages are processed in the same order as API calls.
- Add check for null address in makeA2dpDeviceUnavailableNow().

Bug: 109903807
Bug: 78837311
Test: repro steps in bugs. A2DP connection and playback

Change-Id: Ib81b3805f945f7206b1a60de74e9bbeeef89bdd0
(cherry picked from commit 3c4636c712)
Merged-In: Ib81b3805f945f7206b1a60de74e9bbeeef89bdd0
2018-10-16 15:29:25 -07:00
Treehugger Robot
7cbabff3f0 Merge "iorap: Add presubmit/postsubmit support" 2018-10-16 22:21:33 +00:00
Igor Murashkin
e53713c514 iorap: Remove blank newline in TEST_MAPPING
Change-Id: I378e86327951daa05512efd2ac491d27f9995ddd
2018-10-16 15:15:21 -07:00
Jack Yu
72e3077715 Supported v1.3 data profile
1. Supported IRadio v1.3 data profile.
2. Do not send data profile list when the list is empty.
3. Only set profile id when the data profile must persist on the
   modem.

Test: Manual and unit tests
Bug: 73659459

Change-Id: I1414b5346cec1d617f7093c3761dbd77fe594a8b
2018-10-16 14:21:58 -07:00
Peiyong Lin
bc56d73af2 Merge "[Graphics] Align Display P3 transfer function coefficients."
am: fde18facba

Change-Id: I242a8f1ccf0d2b662d745a0a956da7e7c8e3d790
2018-10-16 11:03:47 -07:00
Paul Duffin
1e69440dff Merge "Remove libcore/io members from light grey list"
am: 2579dcd17e

Change-Id: I38392562cc62f90c0a9b37a0b0ceca4bf5ec976b
2018-10-16 10:52:03 -07:00
Peiyong Lin
fde18facba Merge "[Graphics] Align Display P3 transfer function coefficients." 2018-10-16 17:49:00 +00:00
Treehugger Robot
2579dcd17e Merge "Remove libcore/io members from light grey list" 2018-10-16 17:31:33 +00:00
Nathan Harold
8ae2674d04 Merge "Move SDK Check for getNeighboringCellInfo"
am: 9ec58ff433

Change-Id: Id9975df8d6531103a9c1fa2d77b42699f07b823c
2018-10-16 10:15:13 -07:00
Paul Duffin
66e9d98618 Merge "Fix issue with sort_api.sh"
am: f943c52105

Change-Id: I196e57f5d5f96e5f5e1885e893be21ae81b75207
2018-10-16 10:10:45 -07:00
Peiyong Lin
7a45d2c310 [Graphics] Align Display P3 transfer function coefficients.
The transfer function of Display P3 should be sRGB transfer function,
previously we defined f as 0.039, however, the sRGB transfer function defines f
as 0.04045. This patch fixes it.

BUG: 116726537
Test: Build, flash and boot

Change-Id: I247092d8ce939aa743f23a1f8688cbaf0874fb99
Merged-In: I247092d8ce939aa743f23a1f8688cbaf0874fb99
2018-10-16 16:50:25 +00:00
Nathan Harold
9ec58ff433 Merge "Move SDK Check for getNeighboringCellInfo" 2018-10-16 16:50:22 +00:00
Treehugger Robot
f943c52105 Merge "Fix issue with sort_api.sh" 2018-10-16 16:47:08 +00:00
Eric Holk
d4d3e215d7 Merge "Start on DexBuilder"
am: 3e7d810a2f

Change-Id: I956b5edaefda774fe455180e133d5711a6d2f0f9
2018-10-16 09:42:45 -07:00
Chalard Jean
196af9bd14 Merge changes I66e40b4b,I599a2ff9,I7c210623
am: 127421b2d0

Change-Id: Iba4bb6d1676d889f1e4a781a7970f01c0e321275
2018-10-16 09:14:22 -07:00
Treehugger Robot
3e7d810a2f Merge "Start on DexBuilder" 2018-10-16 15:53:18 +00:00
Treehugger Robot
127421b2d0 Merge changes I66e40b4b,I599a2ff9,I7c210623
* changes:
  [PT16] Simplification of sendProxyBroadcast.
  [PT15] Tiny bugfix in setGlobalProxy
  [PT14] No-op refactoring of sendProxyBroadcast
2018-10-16 14:48:33 +00:00
Paul Duffin
7826c7afa3 Remove libcore/io members from light grey list
These members are now specified using the d.a.c.UnsupportedAppUsage
annotation on the members themselves.

Test: ensured that generated light grey list did not change
Bug: 117818301
Change-Id: I51c2f9544517b46d0b8821fbeb5b008342b99770
2018-10-16 14:30:18 +01:00
Paul Duffin
c78bea41c6 Fix issue with sort_api.sh
Should use -ne not -neq.

Test: run script manually
Bug: 115609023
Change-Id: I337ed43be1f9250e6c2b2c88d97c68a5c9e8941c
2018-10-16 14:30:01 +01:00
Beverly
97f1fa1688 Merge "Fix flaky ScheduleCalendarTest"
am: 08667cc9c1

Change-Id: If0c64d0a7b6f7a51f3a4d09b7ecf9cbad7ad6883
2018-10-16 05:44:38 -07:00
Mathew Inwood
f0a45a4114 Merge "Add new "max-sdk-p blacklist"."
am: adbc7dfc28

Change-Id: Ice435ecdef532f3d25b705cc734773deba84322f
2018-10-16 05:38:00 -07:00
Treehugger Robot
08667cc9c1 Merge "Fix flaky ScheduleCalendarTest" 2018-10-16 11:43:58 +00:00
Mathew Inwood
ea14c0c36f Merge hidden API metadata into a single CSV file.
Add a python script to merge the CSV files, dealing with the fact that the
source columns may differ due to the annotation properties present in the
source.

Add this new file and the existing greylist.txt files as dependencies of
the 'dist' target, so that they appear as artifacts on the build server.
This allows them to be processed later by reading them from the build
server.

Test: m out/target/common/obj/PACKAGING/hiddenapi-greylist.csv
Bug: 117314178
Change-Id: Ib9e5da90e4c32333a3f4f02ee7f159f77086ae5e
2018-10-16 12:12:27 +01:00
Mathew Inwood
adbc7dfc28 Merge "Add new "max-sdk-p blacklist"." 2018-10-16 10:01:39 +00:00
Luke Huang
923aa75d75 Merge "Network-related commands porting"
am: 9b20115264

Change-Id: I96b2bb80cca6e9d80f3f0fe08f7b71ce31b67528
2018-10-16 01:09:30 -07:00