Commit Graph

4646 Commits

Author SHA1 Message Date
Dongwon Kang
176facba14 Merge "TIF: Address API review comments" into nyc-dev
am: 9cd89a403e

* commit '9cd89a403e60f6be665a6068be76b805c8b83402':
  TIF: Address API review comments

(cherry picked from commit f6c9dc9594)
2016-03-01 20:48:50 -08:00
Phil Burk
f5b8848184 Merge "AudioTrack: docs for getUnderrunCount()" into nyc-dev am: 88353459e2
am: f1bc7deffc

* commit 'f1bc7deffc1c733ecf2e5d834274e1c13231d9db':
  AudioTrack: docs for getUnderrunCount()
2016-03-01 20:42:20 +00:00
Phil Burk
88353459e2 Merge "AudioTrack: docs for getUnderrunCount()" into nyc-dev 2016-03-01 19:13:39 +00:00
Hangyu Kuang
44ad2a94f9 Merge "Update Android mediamuxer documentation." into nyc-dev am: 3e0127f5d5
am: 72c713adda

* commit '72c713addaceef80dbd8cd626e1728cd9322f586':
  Update Android mediamuxer documentation.
2016-03-01 17:25:35 +00:00
Hangyu Kuang
3e0127f5d5 Merge "Update Android mediamuxer documentation." into nyc-dev 2016-03-01 17:18:15 +00:00
Ronghua Wu
3f550f5e5b Merge "media: define HEVCProfileMain10HDR10" into nyc-dev am: 78614f7714
am: 91b01d6c4e

* commit '91b01d6c4eefaed20632b8320eea50566ab49bf8':
  media: define HEVCProfileMain10HDR10
2016-03-01 16:41:24 +00:00
Ronghua Wu
78614f7714 Merge "media: define HEVCProfileMain10HDR10" into nyc-dev 2016-03-01 16:35:22 +00:00
Daichi Hirono
d247736f18 Merge "Fix argument type in MtpDatabase#getObjectPropertyValue." into nyc-dev am: 300efaa0ea
am: 8f6c0d2fe1

* commit '8f6c0d2fe10dc283a62a18ab1769b9c408ced611':
  Fix argument type in MtpDatabase#getObjectPropertyValue.
2016-03-01 08:43:50 +00:00
Daichi Hirono
300efaa0ea Merge "Fix argument type in MtpDatabase#getObjectPropertyValue." into nyc-dev 2016-03-01 08:36:28 +00:00
Daichi Hirono
486ad2e73c Fix argument type in MtpDatabase#getObjectPropertyValue.
In MTP code, we use jint for ID (e.g. object handle) and code (property
code). But getObjectPropertyValue takes jlong and it causes missing
property values in Java code. Previously we passed the long value to
Map<Integer, MtpPropertyGroup>#get(Integer) and the compiler somehow
accepted the code. However it actually takes Long at runtime, so the
properties are never found.

BUG=26437284
Change-Id: I79defd325ea5d20c4dce84d891d984e24abcacc5
2016-03-01 16:49:08 +09:00
Jeff Tinker
0371b20a87 Merge "Add javadocs to MediaCodec.CryptoInfo methods" into nyc-dev am: 6430b15495
am: 9d486e5bd8

* commit '9d486e5bd814d7631f2f29c9098fcb3ba7f44ab9':
  Add javadocs to MediaCodec.CryptoInfo methods
2016-03-01 02:38:04 +00:00
Jeff Tinker
6430b15495 Merge "Add javadocs to MediaCodec.CryptoInfo methods" into nyc-dev 2016-03-01 02:26:30 +00:00
Lajos Molnar
aafe36d8ff Merge "media: switch to using MediaImage2" into nyc-dev am: 063a570ef0
am: 29b16d8b08

* commit '29b16d8b089a37a9e4e054742b44a19dc5ded3f5':
  media: switch to using MediaImage2
2016-03-01 00:58:48 +00:00
Lajos Molnar
063a570ef0 Merge "media: switch to using MediaImage2" into nyc-dev 2016-03-01 00:40:30 +00:00
Phil Burk
f6e8da4b23 Merge "AudioService: add support for ENCODED_SURROUND_OUTPUT" into nyc-dev am: 4e572d32f8
am: 2f4d3aa204

* commit '2f4d3aa204d2026cc93fe72049d5c9f0fe39f5eb':
  AudioService: add support for ENCODED_SURROUND_OUTPUT
2016-03-01 00:24:22 +00:00
Jeff Sharkey
3541354007 Merge "Parcelable classes should always be final." into nyc-dev am: 753c347efd
am: 620ef3f226

* commit '620ef3f22654676cd37df23db059a71e0607d6a9':
  Parcelable classes should always be final.
2016-03-01 00:12:20 +00:00
Phil Burk
4e572d32f8 Merge "AudioService: add support for ENCODED_SURROUND_OUTPUT" into nyc-dev 2016-03-01 00:06:21 +00:00
Jeff Tinker
8ad2965d00 Add javadocs to MediaCodec.CryptoInfo methods
bug:27383993

Change-Id: I11bba4a2690d112e4210add41910f14c5ba6a927
2016-02-29 23:49:04 +00:00
Jeff Sharkey
50d1c044b5 Parcelable classes should always be final.
Also hide ConnectivityMetricsEvent which isn't being used yet.

Bug: 27415331
Change-Id: Iacdccddda504f3f669185f807b4f35b8dc2b0212
2016-02-29 16:46:09 -07:00
Phil Burk
ac0f704b1a AudioService: add support for ENCODED_SURROUND_OUTPUT
Preference allows override of AudioPolicyManager.
Lets user force or prevent use of AC3 and DTS regardless
of what the EDID says.

Bug: 26373761
Change-Id: I21440f2b90af9a369a36b7b07724e992501bce6d
Signed-off-by: Phil Burk <philburk@google.com>
2016-02-29 12:20:43 -08:00
Sungsoo Lim
fc9a809c69 Merge "MediaBrowser: Fix Javadoc" into nyc-dev am: 18eda4a1ca
am: 1518146ef1

* commit '1518146ef15212a99abf60323a17f53d0c2c01c8':
  MediaBrowser: Fix Javadoc
2016-02-29 05:25:27 +00:00
Sungsoo Lim
ab19dc8e14 MediaBrowser: Fix Javadoc
Bug: 27384292
Change-Id: I57ddfaea0fe888665bc7ee88cd933a660c26f1a6
2016-02-29 14:03:48 +09:00
Jeff Sharkey
e8bd6c7a3f Merge "When system server goes down, crash apps more." into nyc-dev am: 004bf6ade3
am: 917fe2f8a5

* commit '917fe2f8a540fbc181a8647851a8b660da860286':
  When system server goes down, crash apps more.
2016-02-28 00:27:09 +00:00
Jeff Sharkey
f8880561e6 When system server goes down, crash apps more.
Similar to first patch, but now using new "rethrowFromSystemServer()"
method which internally translates DeadObjectException into
DeadSystemException.  New logic over in Log.printlns() now
suppresses the DeadSystemException stack traces, since they're
misleading and just added pressure to the precious log buffer space.

Add some extra RuntimeInit checks to suppress logging-about-logging
when the system server is dead.

Bug: 27364859
Change-Id: I05316b3e8e42416b30a56a76c09cd3113a018123
2016-02-27 17:17:01 -07:00
Andy Hung
5e8dbc8fb0 Merge "Make master mono controlled through settings" into nyc-dev am: 2362bdf2c7
am: 5bf89b5616

* commit '5bf89b561686d168b04ffab3cd7e61c0d72bc5fa':
  Make master mono controlled through settings
2016-02-27 02:57:17 +00:00
Andy Hung
2362bdf2c7 Merge "Make master mono controlled through settings" into nyc-dev 2016-02-27 02:50:07 +00:00
Phil Burk
2bf39d8e9f AudioTrack: docs for getUnderrunCount()
Remove unnecessary warning about underruns.

Bug: 27384290
Change-Id: Ia872a6580d50952195842c3251370a3dd5da5111
Signed-off-by: Phil Burk <philburk@google.com>
2016-02-26 18:12:31 -08:00
Jae Seo
05c9fc56e5 Merge "TIF: Enable per state input icon in TvInputInfo" into nyc-dev am: 988a430793
am: 46f7ff52b5

* commit '46f7ff52b529e65075802b22c281fc1decd42abc':
  TIF: Enable per state input icon in TvInputInfo
2016-02-27 01:43:57 +00:00
Jae Seo
093fa4ebd8 TIF: Enable per state input icon in TvInputInfo
Also made the fields final and grouped them.

Bug: 23820259
Change-Id: I725c830d7c73e8cbc01b6a4f4f4991cb42258380
2016-02-26 16:54:11 -08:00
Jean-Michel Trivi
71133e5690 Merge "Audio record notification: report audio device information" into nyc-dev am: 768d81374b
am: 957a6cfd6d

* commit '957a6cfd6dd2ea9c6e586f594173a6ebaf34f897':
  Audio record notification: report audio device information
2016-02-26 22:44:35 +00:00
Jean-Michel Trivi
768d81374b Merge "Audio record notification: report audio device information" into nyc-dev 2016-02-26 22:37:34 +00:00
Ronghua Wu
f2615b8b33 media: define HEVCProfileMain10HDR10
Bug: 25684127
Change-Id: I9679eaab9b02aeede3e488d33279477a45887b63
2016-02-26 13:22:52 -08:00
Paul McLean
910f4fcfa9 Merge "Fix unitialized member/init-parameter in AudioTrack(long) and AudioRecord(long)." into nyc-dev am: c3f6a8e066
am: e6e21a6ec8

* commit 'e6e21a6ec874ec4857b913b1bafc99d5b2953dae':
  Fix unitialized member/init-parameter in AudioTrack(long) and AudioRecord(long).
2016-02-26 20:31:49 +00:00
Paul McLean
c707966397 Fix unitialized member/init-parameter in AudioTrack(long) and AudioRecord(long).
Bug: 27381351

Change-Id: Ia11c13bde978dbf1707439b82a18abf22fe23f2f
2016-02-26 13:13:02 -07:00
Jean-Michel Trivi
8ab728093e Audio record notification: report audio device information
Support querying the AudioDeviceInfo in AudioRecordConfiguration.
When AudioService (through RecordingActivityMonitor) receives
  a recording event on an existing session, report it as an
  update if the recording configuration has changed.

Bug 22876530

Change-Id: I1b72c08aa0589077fe8ad254087965e6384ce50a
2016-02-26 11:11:30 -08:00
Paul McLean
93351ccf60 Merge "JNI plumbing for native audio routing API" into nyc-dev am: 0a8b9069b3
am: 6d4ddbf520

* commit '6d4ddbf520157c80e276a80c7704acca9f9aa80c':
  JNI plumbing for native audio routing API
2016-02-26 17:38:17 +00:00
Paul McLean
9b09e533ac JNI plumbing for native audio routing API
Bug: 23899814
Change-Id: I3a831bb661fbdfe1981ae3482fcc8773c7df22b6
2016-02-26 10:15:07 -07:00
Donghyun Cho
34758e0b42 Merge "MediaSession: Update javadoc of prepare-related methods" into nyc-dev am: e9de43f888
am: 806865aaea

* commit '806865aaea0868c0335edbefdce3d48510aa6415':
  MediaSession: Update javadoc of prepare-related methods
2016-02-26 08:29:17 +00:00
Donghyun Cho
e9de43f888 Merge "MediaSession: Update javadoc of prepare-related methods" into nyc-dev 2016-02-26 08:23:41 +00:00
Andy Hung
7b98e9a7e5 Make master mono controlled through settings
Bug: 15283594
Change-Id: I94a84a3ad3bbb0c1179726a4ecc68b7df033af58
2016-02-25 18:34:50 -08:00
Glenn Kasten
5cea5f6d6c Merge "Allow sample rate UNSPECIFIED to mean a route-dependent value" into nyc-dev am: 642a4f5b66
am: 322b3fcccf

* commit '322b3fcccfef93726a9a9a3e14fa341e66f064bd':
  Allow sample rate UNSPECIFIED to mean a route-dependent value
2016-02-26 00:43:54 +00:00
Glenn Kasten
642a4f5b66 Merge "Allow sample rate UNSPECIFIED to mean a route-dependent value" into nyc-dev 2016-02-26 00:17:45 +00:00
Glenn Kasten
1cbf9b3741 Allow sample rate UNSPECIFIED to mean a route-dependent value
Bug: 25641253
Bug: 21019153
Change-Id: I3b8e01b6ea09f42c813ab1a0f3f625dc3803cc0b
2016-02-25 11:39:37 -08:00
Jae Seo
ba94f32b1b Merge "TIF: Define activity action to set up channel sources" into nyc-dev am: 12eb094232
am: 5d93925037

* commit '5d93925037a9d2ea99904aa4f5103f5d1122cf1f':
  TIF: Define activity action to set up channel sources
2016-02-25 18:47:50 +00:00
Jae Seo
12eb094232 Merge "TIF: Define activity action to set up channel sources" into nyc-dev 2016-02-25 18:37:34 +00:00
Jaesung Chung
f0359ea9e2 Merge "Revert "Revert "ExifInterface: switch from using jhead to java implementation""" into nyc-dev am: 596e1d3b7a
am: 7d8f449de2

* commit '7d8f449de21584c555d22c9aaeb05cf4fcdb64a4':
  Revert "Revert "ExifInterface: switch from using jhead to java implementation""
2016-02-25 14:38:11 +00:00
Jaesung Chung
596e1d3b7a Merge "Revert "Revert "ExifInterface: switch from using jhead to java implementation""" into nyc-dev 2016-02-25 14:14:28 +00:00
Jaesung Chung
15ef59e081 Revert "Revert "ExifInterface: switch from using jhead to java implementation""
This reverts commit 3c233ee291.

Bug: 27349581
Change-Id: Ib9f687e79ec36692fa7505ba3852099eb3e44573
2016-02-25 14:13:10 +00:00
Sungsoo Lim
f73e2937ae Merge "Revert "ExifInterface: switch from using jhead to java implementation"" into nyc-dev am: b21622d477
am: 6614d3c741

* commit '6614d3c74131f2c9c57f1930d80ade3c9a209aa6':
  Revert "ExifInterface: switch from using jhead to java implementation"
2016-02-25 11:59:50 +00:00
Sungsoo Lim
b21622d477 Merge "Revert "ExifInterface: switch from using jhead to java implementation"" into nyc-dev 2016-02-25 11:50:43 +00:00