Commit Graph

5648 Commits

Author SHA1 Message Date
Lajos Molnar
8f90602cdb Merge "media: document MediaFormat.KEY_FRAME_RATE better" into nyc-dev am: 017567ae1d am: 7d7f8f2724
am: 251a6dbb82

* commit '251a6dbb82cf5a6855f94c2c8b0a742ef477eaa9':
  media: document MediaFormat.KEY_FRAME_RATE better

Change-Id: I9a279f91e74241b62d45ac4f0bb6fa037276998d
2016-04-29 16:18:00 +00:00
Lajos Molnar
7d7f8f2724 Merge "media: document MediaFormat.KEY_FRAME_RATE better" into nyc-dev
am: 017567ae1d

* commit '017567ae1d7c67e44824ee32a812638b88b48779':
  media: document MediaFormat.KEY_FRAME_RATE better

Change-Id: I32093b7455de821ee8c29832f6a580deba94e111
2016-04-29 16:12:23 +00:00
TreeHugger Robot
017567ae1d Merge "media: document MediaFormat.KEY_FRAME_RATE better" into nyc-dev 2016-04-29 16:04:16 +00:00
Dongwon Kang
6c404e397d Merge "TIF: Change invalid error code to RECORDING_ERROR_UNKNOWN" into nyc-dev am: ddf44fc7ef am: e30706819a
am: 7d0fd74dd2

* commit '7d0fd74dd23fe5ba96a26b0698ef9146b0b701b2':
  TIF: Change invalid error code to RECORDING_ERROR_UNKNOWN

Change-Id: I82b0e99ef6b5ee67000af668de25eefffa65a99a
2016-04-28 21:25:21 +00:00
Dongwon Kang
e30706819a Merge "TIF: Change invalid error code to RECORDING_ERROR_UNKNOWN" into nyc-dev
am: ddf44fc7ef

* commit 'ddf44fc7efac3e2ae25d07781230d3a73a786788':
  TIF: Change invalid error code to RECORDING_ERROR_UNKNOWN

Change-Id: I5ec6cba4d87cd75fc4e172c82201b7b41b9a5a4b
2016-04-28 21:20:41 +00:00
Dongwon Kang
ddf44fc7ef Merge "TIF: Change invalid error code to RECORDING_ERROR_UNKNOWN" into nyc-dev 2016-04-28 21:17:32 +00:00
Hangyu Kuang
29f17b38a7 Merge "media: Change VP9 ProfileLevel to start from 0x1." into nyc-dev am: a516aea am: 573042aab2
am: 94f562671c

* commit '94f562671c8178a12bfbebfa38ee632df09a545b':
  media: Change VP9 ProfileLevel to start from 0x1.

Change-Id: Id75b6d32fdc1fe8f65f1b67cd4a2948e3116ebdf
2016-04-28 19:33:03 +00:00
Hangyu Kuang
94f562671c Merge "media: Change VP9 ProfileLevel to start from 0x1." into nyc-dev am: a516aea
am: 573042aab2

* commit '573042aab2019b314a882ce094d201298c6f4c5a':
  media: Change VP9 ProfileLevel to start from 0x1.

Change-Id: I1008203b45b87f83b69a289a32301c58f601ac14
2016-04-28 19:25:06 +00:00
Hangyu Kuang
418b5fcf55 Merge "media: Change VP9 ProfileLevel to start from 0x1." into nyc-dev
am: a516aea7c5

* commit 'a516aea7c588845fba49fa2dc0dffcde4448670c':
  media: Change VP9 ProfileLevel to start from 0x1.

Change-Id: Iea77c49a0a9c4cf04c705ba3ac22efb3beeafaa0
2016-04-28 19:24:42 +00:00
Hangyu Kuang
f939e4adf1 media: Add missing dobly-vision profile.
Bug:28411120
Change-Id: I92eecd7436365fab2668e66b8759c68e7d7af298
2016-04-28 11:57:40 -07:00
Hangyu Kuang
9186c38fce media: Change VP9 ProfileLevel to start from 0x1.
Bug:28380207
Related to Bug: 25684127

Change-Id: I9f18358744e9406b34dc880e6eb533945eabe104
2016-04-26 17:51:59 -07:00
Lajos Molnar
7a2ab16b65 VideoCapabilities: account for block size for getAchievableRates
Bug: 25597057
Change-Id: I1a01e4b466e2b70cebf55179c83806fe269a31ee
2016-04-26 13:42:44 -07:00
Dongwon Kang
150923ac6a TIF: Change invalid error code to RECORDING_ERROR_UNKNOWN
Bug: 28146354
Change-Id: Ida6525b77abf3cd8988fb948ce41645d6983fa95
2016-04-26 10:02:04 -07:00
Lajos Molnar
7a2b3f879a Merge "CodecCapabilities: handle legacy VP9 codecs with no profiles" into nyc-dev am: af8be42 am: 1502c7d
am: 31c67a9

* commit '31c67a9d81d193d46c0ad3db09d3c1c41737b6c6':
  CodecCapabilities: handle legacy VP9 codecs with no profiles

Change-Id: I22218c2544a2467b1215ff866df0de3ee8908b9b
2016-04-25 23:36:32 +00:00
Lajos Molnar
f1d1068de3 Merge "clarify MediaCodec.setVideoScalingMode behavior" into nyc-dev am: 4710431 am: f8be4de
am: 70abaea

* commit '70abaea24f6862808b2ab7bef298d8a19cc4f947':
  clarify MediaCodec.setVideoScalingMode behavior

Change-Id: Ic0f9c8a9744d58cfc9915d8c37b335ad690c03aa
2016-04-25 23:36:00 +00:00
Dongwon Kang
ad35c9d73f Merge "TIF: Be consistent with argument name for startRecording" into nyc-dev am: 0751a83 am: f9b3a02
am: 39045d4

* commit '39045d43216f43a893ee8c6c4cf3b3b37effe371':
  TIF: Be consistent with argument name for startRecording

Change-Id: I9cd60435f70924ca421354eabb7ca398ac6ae0cc
2016-04-25 23:03:52 +00:00
Lajos Molnar
1502c7dbdd Merge "CodecCapabilities: handle legacy VP9 codecs with no profiles" into nyc-dev
am: af8be42

* commit 'af8be42b9f6aa17c8d17d999b53227f0a1d6da5b':
  CodecCapabilities: handle legacy VP9 codecs with no profiles

Change-Id: Ifa9dc112632061f0c292e74fb19279b8c79f6323
2016-04-25 22:57:55 +00:00
Lajos Molnar
f8be4dee8d Merge "clarify MediaCodec.setVideoScalingMode behavior" into nyc-dev
am: 4710431

* commit '4710431dc4751e9674b9e2e620f425603cf24643':
  clarify MediaCodec.setVideoScalingMode behavior

Change-Id: Ia32689d261315c1030ab66bb0870768aae2835cd
2016-04-25 22:57:52 +00:00
TreeHugger Robot
af8be42b9f Merge "CodecCapabilities: handle legacy VP9 codecs with no profiles" into nyc-dev 2016-04-25 22:43:30 +00:00
Dongwon Kang
f9b3a021c3 Merge "TIF: Be consistent with argument name for startRecording" into nyc-dev
am: 0751a83

* commit '0751a83a99dc4481533ed706a942b8bb9caf8834':
  TIF: Be consistent with argument name for startRecording

Change-Id: I27de469a898051caa8e7e41ca170c79ac0e7e3d1
2016-04-25 22:04:42 +00:00
Lajos Molnar
a477a6e288 clarify MediaCodec.setVideoScalingMode behavior
Bug: 28131249
Change-Id: I4fd3a5333cbdc0ebec683c9a43ce071478a79d90
2016-04-25 13:28:53 -07:00
Lajos Molnar
8acc164738 CodecCapabilities: handle legacy VP9 codecs with no profiles
Bug: 26935336
Change-Id: I1049b9da8e6c984f86e307990000401b66119693
2016-04-25 13:28:06 -07:00
Dongwon Kang
0751a83a99 Merge "TIF: Be consistent with argument name for startRecording" into nyc-dev 2016-04-25 20:16:22 +00:00
Dongwon Kang
0cb5244e52 TIF: Be consistent with argument name for startRecording
Change-Id: Icb0125049cc92c5664e0810cdb86f1cb0903405f
2016-04-25 13:15:18 -07:00
Sujith Ramakrishnan
fa5a632067 Merge "Unbundle RemoteService on TV - part 3" into nyc-dev am: 7981e8f am: a2262b3
am: c5826ee

* commit 'c5826eebc50a6ffafe8cd20633b01b6ca27e8490':
  Unbundle RemoteService on TV - part 3

Change-Id: If0dabbb8199132648fa9a791f46ee85e8970eb4b
2016-04-22 21:36:53 +00:00
Sujith Ramakrishnan
c5826eebc5 Merge "Unbundle RemoteService on TV - part 3" into nyc-dev am: 7981e8f
am: a2262b3

* commit 'a2262b3bb15497c6ee4854cfcf7a43fc07c2c876':
  Unbundle RemoteService on TV - part 3

Change-Id: I45fbdda42aa5d9f5d9c25a027dd11eb7b0f560a1
2016-04-22 21:04:43 +00:00
Sujith Ramakrishnan
de3f4aead5 Merge "Unbundle RemoteService on TV - part 3" into nyc-dev
am: 7981e8f

* commit '7981e8ff6509769a590f15b440f989437d732be5':
  Unbundle RemoteService on TV - part 3

Change-Id: Ib5eb6363e904a1f66000d12263f66a8e5bd1f663
2016-04-22 21:02:04 +00:00
Sujith Ramakrishnan
b5b86c1100 Unbundle RemoteService on TV - part 3
- New service TVRemoteService triggered by SystemServer
- Provider service proxy and watcher for maintaining connections to unbundled
  services which have the BIND_TV_REMOTE_SERVICE permission.
- Shared library to facilitate connections between unbundled service and
  TVRemoteService.
- Unbundled service needs TV_VIRTUAL_REMOTE_CONTROLLER
  permission to be fully functional.

b/23792608

Change-Id: Ief5c6995883d1f7268a73bdd0c920c4c3f42cddb
2016-04-22 12:21:34 -07:00
Dongwon Kang
fb6c782e27 Merge "TIF: Address API review comments" into nyc-dev am: b0df08598c am: 9c19a27e20
am: f074a363d4

* commit 'f074a363d449a17e6b5fd19ae414722f8b3965fe':
  TIF: Address API review comments

Change-Id: I23be09441ff5f361af8869cbc6a8168871189baf
2016-04-22 18:09:57 +00:00
Dongwon Kang
9c19a27e20 Merge "TIF: Address API review comments" into nyc-dev
am: b0df08598c

* commit 'b0df08598c9005938a8315a76c148967e6e06fc4':
  TIF: Address API review comments

Change-Id: I9e493f4bbee4cf6cd6382fb0539c357083c23617
2016-04-22 18:00:41 +00:00
Dongwon Kang
b0df08598c Merge "TIF: Address API review comments" into nyc-dev 2016-04-22 17:54:34 +00:00
Tobias Thierer
ef773e84c6 frameworks/base: Avoid Long object allocations in Long.valueOf() am: 28532d0026
am: 9031ab18fd

* commit '9031ab18fdb0187016998d0e192df12160265b9c':
  frameworks/base: Avoid Long object allocations in Long.valueOf()

Change-Id: I87089a855f76ccbdb086185000f13e803023e67a
2016-04-22 12:58:47 +00:00
Tobias Thierer
28532d0026 frameworks/base: Avoid Long object allocations in Long.valueOf()
Replace usages where the Long is immediately unboxed or thrown
away with Long.parseLong().
In TaskRecord.java, I also fixed up similar uses of
{Boolean,Integer}.valueOf()

Tested: built frameworks/base successfully.

Bug: 28289401
(cherry picked from commit 4bd017d6a5)

Change-Id: Icfa4708946e774f4a1bacf185c3fd11a7087017e
2016-04-22 13:36:53 +01:00
Daichi Hirono
c56a2e890b Merge "Add throws definition to MtpDevice#readEvent." into nyc-dev am: 4dfde6079c am: 80038a33e3
am: 8a24bfc7bc

* commit '8a24bfc7bc02c98a55979b6a791f81a74a3953e3':
  Add throws definition to MtpDevice#readEvent.

Change-Id: If2c8bf590db5d0b9a5198e972355ad8fb21ca1a7
2016-04-22 00:24:32 +00:00
Daichi Hirono
991381aacf Merge "Handle API review comments from the council." into nyc-dev am: b9c64cd2c0 am: 4ab0f745d5
am: 8c46042510

* commit '8c46042510a7af745a744d02d0c2cf9340415423':
  Handle API review comments from the council.

Change-Id: I3af5de86e27a3ea12602a0bf4fcee67f2d546385
2016-04-22 00:24:14 +00:00
Daichi Hirono
80038a33e3 Merge "Add throws definition to MtpDevice#readEvent." into nyc-dev
am: 4dfde6079c

* commit '4dfde6079c492ab0f54e699c367abf89a5e0dfa3':
  Add throws definition to MtpDevice#readEvent.

Change-Id: I81e7931e7ae2256aec06aa775fedf8c3f6506176
2016-04-22 00:12:24 +00:00
Daichi Hirono
4ab0f745d5 Merge "Handle API review comments from the council." into nyc-dev
am: b9c64cd2c0

* commit 'b9c64cd2c06933eda7ff1e691b80c53a74ff09d7':
  Handle API review comments from the council.

Change-Id: I9f082a99d5c8cbce3aaa9708f5f0ea75cc5a9ed6
2016-04-22 00:12:20 +00:00
Daichi Hirono
4dfde6079c Merge "Add throws definition to MtpDevice#readEvent." into nyc-dev 2016-04-22 00:00:33 +00:00
Daichi Hirono
b9c64cd2c0 Merge "Handle API review comments from the council." into nyc-dev 2016-04-22 00:00:33 +00:00
Eric Laurent
21b4f58935 Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev am: dc7ce84095 am: 0bf32f0589
am: a81007c25c

* commit 'a81007c25c65c2b287fff0b4c08d5857711f9086':
  AudioManager: fix isBluetoothA2dpOn()

Change-Id: I5244d989105ac41a5cedc25d1e7d3757084482c4
2016-04-21 18:30:56 +00:00
Eric Laurent
a81007c25c Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev am: dc7ce84095
am: 0bf32f0589

* commit '0bf32f0589efc3412af702ce370d7a79432e4ec7':
  AudioManager: fix isBluetoothA2dpOn()

Change-Id: I30868022115cd389036efed24189f1f26c21c3af
2016-04-21 18:28:38 +00:00
Eric Laurent
bdf90a2d1c Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev
am: dc7ce84095

* commit 'dc7ce840950398518cc116924b173eb7b7f3288a':
  AudioManager: fix isBluetoothA2dpOn()

Change-Id: I7a655431e766701b2f02c468aae163554e47ecdb
2016-04-21 18:26:21 +00:00
Eric Laurent
dc7ce84095 Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev 2016-04-21 18:22:59 +00:00
Tobias Thierer
4bd017d6a5 frameworks/base: Avoid Long object allocations in Long.valueOf()
Replace usages where the Long is immediately unboxed or thrown
away with Long.parseLong().
In TaskRecord.java, I also fixed up similar uses of
{Boolean,Integer}.valueOf()

Tested: built frameworks/base successfully.

Bug: 28289401
Change-Id: I1fad536853a68c7b0707cbf02989aca155064843
2016-04-21 16:23:56 +01:00
Phil Burk
6d7af5526b Merge "MidiDevice: do not open ports on closed device" into nyc-dev am: 2faac0d am: 10f1740
am: 922d88db31

* commit '922d88db313a25c27a6c6a51f15099eafb06e55d':
  MidiDevice: do not open ports on closed device

Change-Id: If85a24e63dee26b4c4ab27376602b2b973c1db24
2016-04-21 00:23:12 +00:00
Eric Laurent
9656df2b2e AudioManager: fix isBluetoothA2dpOn()
Test all A2DP type variants when checking if an A2DP device is connected
in isBluetoothA2dpOn().

Bug: 28286051
Change-Id: I756d632b12d584d8a27cc1890e758d8accff7120
2016-04-20 16:42:28 -07:00
Phil Burk
10f1740c1c Merge "MidiDevice: do not open ports on closed device" into nyc-dev
am: 2faac0d

* commit '2faac0d74169ddc1f54f9cd356dc23b96a74c9eb':
  MidiDevice: do not open ports on closed device

Change-Id: I6f98e504d682a5902dd29f5fa54023e7a8bc9814
2016-04-20 21:52:33 +00:00
Phil Burk
01ab4d62d9 MidiDevice: do not open ports on closed device
Fix involves client side mIsDeviceClosed flag.

Bug: 24949216
Change-Id: I666284a787fbb9a710d2372fb424e8e54f6a2825
Signed-off-by: Phil Burk <philburk@google.com>
2016-04-20 12:30:42 -07:00
Daichi Hirono
60fa3615bc Add throws definition to MtpDevice#readEvent.
Previously MtpDevice#readEvent does not have throws IOException at its
definition, though internal JNI functions throws it.

BUG=28254719
Change-Id: I4e6cf8003d168b7e732c4b4eb2eafe52a12442c2
2016-04-20 14:48:23 +09:00
Dongwon Kang
ee564881d9 TIF: Address API review comments
- Remove TIS.updateTvInputInfo and unhide TIM.updateTvInputInfo
- Add more doc on RECORDING_ERROR_UNKNOWN

Bug: 28146354
Change-Id: I581ef17b60e0933f5c07df3f398d15b890b2e29d
2016-04-18 19:36:21 +00:00