Commit Graph

5648 Commits

Author SHA1 Message Date
Jae Seo
cf7b33426e Merge "Fix documentation for channel types" into nyc-dev 2016-06-02 00:03:53 +00:00
Lajos Molnar
12273862c3 Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev
am: 9061b26f1e

* commit '9061b26f1ecba936f6f912398a9238c21dfa789c':
  media: avoid NPE in CodecCapabilities.createFromProfileLevel

Change-Id: I3cd969d6e686714cd7d9fa49eec70e9d810df36b
2016-06-01 23:44:12 +00:00
Robert Shih
d748cf6ff3 resolve merge conflicts of d579be0 to nyc-dev-plus-aosp am: 4c3d43d2c2
am: e188177c21

* commit 'e188177c21e65545cb29c972a0fe06457669512a':
  Fix deadlock when showing subtitles MediaPlayer

Change-Id: Id7017b8cc3352cf2ee5f3f6c8590cda97c373a99
2016-06-01 23:39:39 +00:00
TreeHugger Robot
9061b26f1e Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev 2016-06-01 23:29:49 +00:00
Robert Shih
4c3d43d2c2 resolve merge conflicts of d579be0 to nyc-dev-plus-aosp
Change-Id: Ib64df6377d95578581fd7d311aaffc3ef64dd622
2016-06-01 14:53:09 -07:00
Robert Shih
d579be0cf2 Merge "Fix deadlock when showing subtitles MediaPlayer" into nyc-dev 2016-06-01 17:17:00 +00:00
Jae Seo
750e48738c Fix documentation for channel types
Bug: 28747244
Change-Id: I492bdb94400b298d7f2e0ccf9054761e60c5a548
2016-06-01 08:24:18 -07:00
Lajos Molnar
a0846251d2 Merge "media: avoid recursion when evaluating profile support" into nyc-dev am: a72a83a172 am: bf3d1fc245
am: d3560d6c05

* commit 'd3560d6c05b624ae739097fd5980787113440699':
  media: avoid recursion when evaluating profile support

Change-Id: I32a3f8c7d7f96ced191790ddfacb4405d9474a27
2016-06-01 01:21:47 +00:00
Lajos Molnar
bf3d1fc245 Merge "media: avoid recursion when evaluating profile support" into nyc-dev
am: a72a83a172

* commit 'a72a83a1724d1a2b047fdbb8ab343db6b9b4b7ae':
  media: avoid recursion when evaluating profile support

Change-Id: I41d6aac773ab5c31b700eea343d9a143934c2f6b
2016-06-01 01:05:30 +00:00
Lajos Molnar
87436bb67f media: avoid recursion when evaluating profile support
Bug: 28671284
Bug: 29041205
Change-Id: Ia9b3596a122bd5ba554a4b4ede875ebcadc67b67
2016-05-31 16:41:27 -07:00
Robert Shih
ed78114ffd Fix deadlock when showing subtitles MediaPlayer
Move all SubtitleTrack operations to TimeProvider's event handler thread.

Bug: 28784397
Change-Id: Iff848635390e99ffb19add03277a9d62feece4cc
2016-05-27 15:16:47 -07:00
Phil Burk
42facec856 Merge "Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev am: d34d06606d am: 29e8879307" into nyc-mr1-dev-plus-aosp
am: 380221f94f

* commit '380221f94f528a8acd684626c5130b5a51a92044':
  AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY

Change-Id: I03cb23c0c7820ec481e26a34b49940a738405d26
2016-05-27 17:14:11 +00:00
Phil Burk
f6f5ad9cd0 Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev am: d34d06606d
am: 29e8879307

* commit '29e8879307bc0a73f34b12074944c788821a4373':
  AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY

Change-Id: Id74f4c4831fd070cfdfb1228c9813635bd18ccbc
2016-05-27 03:02:09 +00:00
Lajos Molnar
0d8337c314 media: avoid NPE in CodecCapabilities.createFromProfileLevel
Bug: 28980577
Change-Id: Id020ed350e2a16b7772e05bd6a10235481903b40
2016-05-26 11:45:16 -07:00
Phil Burk
4eccbbf926 Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev
am: d34d06606d

* commit 'd34d06606dd5be9fc18029e87cb4b56ecef21864':
  AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY

Change-Id: I9a656fe5e1ab598994f7a03984510cb1e9387f01
2016-05-26 17:53:19 +00:00
Phil Burk
d34d06606d Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev 2016-05-26 17:46:08 +00:00
Phil Burk
2050f6cb43 AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY
Explain buffer size optimization.

This CL has no code changes, just documentation changes.

Bug: 28802853
Change-Id: I91942f00a3e9691e4fc05b24656b8bf4cb538bc2
Signed-off-by: Phil Burk <philburk@google.com>
2016-05-26 10:34:50 -07:00
Daichi Hirono
86c1a9bf60 Remove MTP API marked as @removed.
BUG=28146379

Change-Id: I4f0a380941663eac423f8a5633447f1eceb516cb
2016-05-26 16:39:21 +09:00
Lajos Molnar
1dc65e4d68 Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev am: 40585321d7 am: e3d6b69562
am: c2d9a234c1

* commit 'c2d9a234c19922fa06b584db20c40b3a114ad9d0':
  media: check profile, level and bitrate for isFormatSupported

Change-Id: Ic8636c55b21b57f8569f63aaf5e6b64b1b148037
2016-05-26 06:50:43 +00:00
Lajos Molnar
e3d6b69562 Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev
am: 40585321d7

* commit '40585321d7b036ce7f609fbf10e8730deb1ad456':
  media: check profile, level and bitrate for isFormatSupported

Change-Id: I86e99d56a5048554fe02f9472f8e81dfe0fbc15a
2016-05-26 06:27:34 +00:00
Lajos Molnar
0581ee4971 media: check profile, level and bitrate for isFormatSupported
Bug: 28671284
Change-Id: I90639816a7410cf65bcd1c5549c3830ca43b8140
2016-05-25 07:44:15 -07:00
Jean-Michel Trivi
3109da2e8b Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev am: 3a91a8417a am: 30979c2c76
am: 1e34fb313b

* commit '1e34fb313b3aec0961f598265a13d444ba149766':
  Remove deprecated AudioManager.AudioRecordingCallback method

Change-Id: I09972d0abc1488ff324e9bca9750923cfa8f9e51
2016-05-24 21:35:17 +00:00
Jean-Michel Trivi
1e34fb313b Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev am: 3a91a8417a
am: 30979c2c76

* commit '30979c2c765a647b85e98691e517bb3d4d395668':
  Remove deprecated AudioManager.AudioRecordingCallback method

Change-Id: I250ba004e8389be3b98151f7173cf729a6c386d0
2016-05-24 21:31:14 +00:00
Jean-Michel Trivi
2c5efb4827 Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev
am: 3a91a8417a

* commit '3a91a8417a9de03a2f8f276fcd2d67dc43315464':
  Remove deprecated AudioManager.AudioRecordingCallback method

Change-Id: I1211c2411d052762d95896c0e22661bd718c3039
2016-05-24 21:24:03 +00:00
Jean-Michel Trivi
3a91a8417a Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev 2016-05-24 21:17:49 +00:00
Lajos Molnar
762db297f7 Merge "media: unhide codec levels" into nyc-dev am: aba6e2c78f am: 674262b7e1
am: cb86750595

* commit 'cb86750595879dcf633f2bcd630831116904c5db':
  media: unhide codec levels

Change-Id: Ie55028a97f05d5d8957dcf39828a45c3747a71a9
2016-05-24 19:21:49 +00:00
Lajos Molnar
cb86750595 Merge "media: unhide codec levels" into nyc-dev am: aba6e2c78f
am: 674262b7e1

* commit '674262b7e14e0837464731f0150450a4d57ec58c':
  media: unhide codec levels

Change-Id: I226686f6b7215422878e35254eba26c81485f4e1
2016-05-24 19:12:45 +00:00
Jean-Michel Trivi
602dc777c5 Remove deprecated AudioManager.AudioRecordingCallback method
Remove AudioRecordingCallback.onRecordingConfigChanged(
         AudioRecordingConfiguration[] configs)

Bug 28819230

Change-Id: I3b85bb9313267499ac407099939b5889bdba996b
2016-05-24 12:11:59 -07:00
Lajos Molnar
4493049a88 Merge "media: unhide codec levels" into nyc-dev
am: aba6e2c78f

* commit 'aba6e2c78f3188d201365a99f52be3074fc94962':
  media: unhide codec levels

Change-Id: I5a0253e8f8fe65551dadf8b3b024224fedd1042d
2016-05-24 18:56:32 +00:00
Eric Laurent
a65262e9a9 Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev am: b143e3de34 am: 50103561d2
am: 45309a4a95

* commit '45309a4a950a0c46f8933481e22c16f1d618db4d':
  Fix AudioTrack and AudioRecord documentation

Change-Id: I9da5a69426b790bbf4a0c6a22ae894b7f1258220
2016-05-24 18:02:25 +00:00
Eric Laurent
50103561d2 Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev
am: b143e3de34

* commit 'b143e3de34ab98463a641fd6d67165fce878f1ff':
  Fix AudioTrack and AudioRecord documentation

Change-Id: I2fe322e51f6a7dc548d8f7964fae033b14219b02
2016-05-24 17:33:13 +00:00
Lajos Molnar
6c2e08083a media: unhide codec levels
Bug: 28930361
Change-Id: Ic9c55389c75ef0b789722aa0a7bddd5f56b15049
2016-05-24 10:24:47 -07:00
Eric Laurent
b143e3de34 Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev 2016-05-24 17:15:11 +00:00
Lajos Molnar
1aa007cda1 media: add missing levels in CodecProfileLevel and fix limits am: 2a4001ee62 am: 01df627536
am: 729a885a6b

* commit '729a885a6b631860389b95f1b6ef1ba20e8a872e':
  media: add missing levels in CodecProfileLevel and fix limits

Change-Id: Ic6ace2469b50d49584d8d33c9d15a14d4852ed95
2016-05-24 16:30:16 +00:00
Lajos Molnar
01df627536 media: add missing levels in CodecProfileLevel and fix limits
am: 2a4001ee62

* commit '2a4001ee62f3374d7fffed72d71f77c5a833c331':
  media: add missing levels in CodecProfileLevel and fix limits

Change-Id: Ibfcfb720cd1503e4318ebcd14dc29749a535038c
2016-05-24 16:07:24 +00:00
Lajos Molnar
2a4001ee62 media: add missing levels in CodecProfileLevel and fix limits
Bug: 28671284
Change-Id: Ie4a91f5639ce8f1c5ac825ec829ac82e695d18b5
2016-05-24 07:43:51 -07:00
Eric Laurent
219de73da2 Fix AudioTrack and AudioRecord documentation
Improve documentation for error codes returned by
AudioTrack.write() and AudioRecord.read() methods.
Fix native to JAVA error code conversion in JNI.

Bug: 28906466

Change-Id: I4d48b1d428834b7a39a14e2d81b6c164696817a8
2016-05-23 17:36:43 -07:00
Jean-Michel Trivi
2941387f5c Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29 am: f2c8fb8620
am: 740c0424f0

* commit '740c0424f0a817746c6071942a6563a603649697':
  Recording activity notification: return list of configuration

Change-Id: I3289964e2ceaeb999803abc1f5d485857a80894b
2016-05-23 21:59:29 +00:00
Jean-Michel Trivi
740c0424f0 Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29
am: f2c8fb8620

* commit 'f2c8fb8620224eecfbc344a203e32e6563afcfd6':
  Recording activity notification: return list of configuration

Change-Id: I795d0a76efd044630cd275060dd6c11d595f0e82
2016-05-23 21:06:05 +00:00
Jean-Michel Trivi
bbcf18dbfd Merge "Recording activity notification: return list of configuration" into nyc-dev
am: c991879f29

* commit 'c991879f29c399ad7ede2b5c2c82e2e748f5e0df':
  Recording activity notification: return list of configuration

Change-Id: I926b2cacd7a645ec42f249a0d45a6a822f05eded
2016-05-23 20:56:04 +00:00
Jean-Michel Trivi
f04fab160a Recording activity notification: return list of configuration
Use a list of configurations instead of an array

Bug 28819230

Change-Id: Ia4a3cdabf8337cfb98abe4d0055d497bcab8a5ee
2016-05-23 09:44:58 -07:00
Jae Seo
86b36a4c6c Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev am: 44fbbfd248 am: 79108f18bf
am: 91b7a92ca0

* commit '91b7a92ca025bc2d6e81b35985ff1be4cb0f6f7b':
  MediaBrowserService: Add more explanation on getBrowserRootHints()

Change-Id: I37df22bf31bd5e32005611744122eb69311683af
2016-05-20 21:11:07 +00:00
Jae Seo
79108f18bf Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev
am: 44fbbfd248

* commit '44fbbfd24857ad0defcaa0ef85c0d5b01cd2250a':
  MediaBrowserService: Add more explanation on getBrowserRootHints()

Change-Id: I0cc37df958a3419770cc943a077f35bd3c41a324
2016-05-20 21:02:11 +00:00
Jae Seo
bd6c16908d MediaBrowserService: Add more explanation on getBrowserRootHints()
Bug: 28840985
Change-Id: If4dbcaaa23093b2e6d5ab6158db67b1248464fb8
2016-05-19 14:17:27 -07:00
Jae Seo
7128f82cea Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev am: 7996b96311 am: 3488ed71d2
am: d0006f584f

* commit 'd0006f584fb8c5ff2283d6211bbc957b96065243':
  TIF: Throw a more appropriate runtime exception when building TvInputInfo

Change-Id: Ifc07ec617b326bc29e7126116aa2a33a9d635bee
2016-05-17 19:10:29 +00:00
Jae Seo
3488ed71d2 Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev
am: 7996b96311

* commit '7996b96311eec2343c16d3677fb834d2ec7cf082':
  TIF: Throw a more appropriate runtime exception when building TvInputInfo

Change-Id: Ic7a930eb85984bab3e4a83ffa02ad30c30a568cf
2016-05-17 18:51:02 +00:00
Jae Seo
18c0cfb075 TIF: Throw a more appropriate runtime exception when building TvInputInfo
Bug: 28775591
Change-Id: I934c8d7fed3dda356cdc3bafe51a79f585918ed0
2016-05-17 10:06:36 -07:00
The Android Automerger
10b889de7d stephenli Manually merge commit '68fffa5'
* commit '68fffa5': (23 commits)
  Fix smallest width configuration calculation
  docs: DoDS, wearable reference docs
  Switch the default text selection handles to Material style.
  docs: Noted minor API changes in release notes
  docs: added "billions" doc in Distribute>Essentials
  Remove wear design pages redirecting to design/wear
  correct the support library redirects to redirect whole path
  Stop saving ActionMenuItemView state.
  Fix iterator double-advance in ContentObserverController
  TIF: Remove the uniqueness check for track ID from notifyTracksChanged
  Update and add attributes to the JavaDoc for VectorDrawable
  Use Q=100 JPEG instead of PNG for wallpaper display
  Fix issue #28400000: Settings memory UI still showing z-ram...
  docs: Updated support library revision history for 23.4.0
  docs: Updates to notifications for DP3
  docs: Added emoji section to api overview.
  Fixed a bug where the QS was animating wrong when closing
  Fix KeyguardManager.isSecure() to observe work profile
  cherrypick from mnc-docs docs: Updated APK Signature Scheme v2 doc.
  Docs: Added new Whitelist feature to Data Saver for DP3
  ...
2016-05-12 02:10:33 +00:00
Jae Seo
e0b04a29bf Merge "TIF: Remove the uniqueness check for track ID from notifyTracksChanged" into nyc-dev
am: d1fe7ea84f

* commit 'd1fe7ea84fc5abeb495261f69e288851a3f3abd4':
  TIF: Remove the uniqueness check for track ID from notifyTracksChanged

Change-Id: I7f75213f543b91ef0a36bd4806f7590b8b9ae0ad
2016-05-12 00:38:13 +00:00
Jae Seo
a2a03aa026 TIF: Remove the uniqueness check for track ID from notifyTracksChanged
Requiring uniqueness of ID across all track types seems a little too
much demand for developers and they do want to use the same ID on
different track types. Also, this doesn't seem terribly useful.
Hence remove the check.

Bug: 28436618
Change-Id: I9040310c5ce31bcff522021d83f7508506cbd9d3
2016-05-11 14:32:08 -07:00