10605 Commits

Author SHA1 Message Date
Sungsoo Lim
bb71aed9ac Merge "MediaBorwserService: Update javadoc" into nyc-dev 2016-03-04 05:48:38 +00:00
Sungsoo Lim
97243a8ff2 MediaBorwserService: Update javadoc
Bug: 26733259
Change-Id: I7240149c0cbbacf221e466908e6ebc201d603c5f
2016-03-04 14:47:23 +09:00
Jeff Tinker
e883f6c299 Merge "Fix uninitialized crypto pattern" into nyc-dev 2016-03-04 01:35:55 +00:00
Jeff Tinker
e872ac45f7 Fix uninitialized crypto pattern
Apps built against an older API don't have the recently
added pattern field in MediaCodec.CryptoInfo which causes
the crypto pattern fields to be uninitialized.  This change
ensures the pattern is initialized in all cases.

bug: 27477422
Change-Id: I5796bf5fbca93dba5bf9a2b74c1c6638b9e90f65
2016-03-03 15:47:09 -08:00
Wei Jia
ebdc198e2f Merge "MediaPlayer: use local variable to check member is null." into nyc-dev 2016-03-03 21:03:24 +00:00
Wei Jia
a2239b78f8 MediaPlayer: use local variable to check member is null.
Bug: 26961341
Change-Id: I343b18f4bfaba9b119a6721e1b39415474149d75
2016-03-03 10:02:19 -08:00
Lajos Molnar
4ab9756906 Merge "media: Add track ID format key" into nyc-dev 2016-03-03 16:14:26 +00:00
Lajos Molnar
6ef0ac3278 media: Add track ID format key
Bug: 25684127
Change-Id: I574515c3c144f5cabe4f40d934d062de1dd20851
2016-03-03 16:12:52 +00:00
Lajos Molnar
7c7fef1585 media: correctly return cached size for MediaDataSource
Bug: 27431229
Change-Id: I884e43960789c139b48964deba8f56b3bc3ba590
2016-03-02 17:05:10 -08:00
Jean-Michel Trivi
99278e1c72 Rename AudioRecordConfiguration to AudioRecordingConfiguration
In package android.media: rename AudioRecordConfiguration to
   AudioRecordingConfiguration to avoid ambiguity with the
   android.media.AudioRecord class

Bug 27385560

Change-Id: Ia633ac30cbe151b8f0f903dc96a459a56737ace2
2016-03-02 14:43:41 -08:00
Jean-Michel Trivi
28ff76b455 API changes for audio recording notifications
Make AudioRecordConfiguration final since it is parcelable.
In AudioRecordingCallback, pass the array of active recording
  configurations.
Add @IntDef for return values for
  AudioRecordConfiguration.getClientAudioSource()

Bug 27385560

Change-Id: I01193577f50e50496742d888b45f89a2c3b67904
2016-03-02 14:40:03 -08:00
Eino-Ville Talvala
74989b4d3f Merge "Camera2: Switch to auto-gen C++ binder interfaces" into nyc-dev 2016-03-02 21:47:13 +00:00
Insun Kang
c9763d766c Fix wrong metadata conversion in MediaSessionLegacyHelper
Bug: 27447464
Change-Id: I4d2ec5b3fe480636dcc76b1f3a4f0b1a110defae
2016-03-02 23:30:53 +09:00
Sungsoo Lim
64f16f1dc1 MediaBrowserService: Make SubscriptionCallback.onError be called
Bug: 26733259
Change-Id: I8324e1c56e87071e781550ac0701e632a4122e73
2016-03-02 14:08:18 +09:00
Jeff Sharkey
60b7bcc614 Merge "When system server goes down, crash apps more." into nyc-dev 2016-03-02 02:42:16 +00:00
Jeff Sharkey
c53962d4ed When system server goes down, crash apps more.
Apps making calls into the system server may end up persisting
internal state or making security decisions based on the perceived
success or failure of a call, or the default values returned.

The reality is that if the system process just died, init will be
along shortly to kill all running apps, so we should have no problem
rethrowing the RemoteException as a RuntimeException.

Bug: 27364859
Change-Id: Ife0bcb079636c88d54c44d17eb580409fd79028b
2016-03-01 19:29:16 -07:00
Insun Kang
542221d68a Merge "Annotate Media section of framework/base" into nyc-dev 2016-03-02 01:36:10 +00:00
Eino-Ville Talvala
5d2d7788f1 Camera2: Switch to auto-gen C++ binder interfaces
- Move camera AIDL files to frameworks/av
 - Update makefiles to point to new AIDL locations
 - Adjust camera2 implementation to match modifications to AIDL needed
   for native AIDL auto-generation
 - Move Surface.aidl to frameworks/native to allow use in
   native AIDL. Use android::view::Surface in Surface JNI to
   serialize Surface objects to ensure parceling compatibility.
 - Adjust service binder tests to new interface

Bug: 25091611
Change-Id: I85b817374b34a4540fa145328dbe4bbf7f746baf
2016-03-01 17:15:17 -08:00
Dongwon Kang
9cd89a403e Merge "TIF: Address API review comments" into nyc-dev 2016-03-01 22:11:47 +00:00
Phil Burk
88353459e2 Merge "AudioTrack: docs for getUnderrunCount()" into nyc-dev 2016-03-01 19:13:39 +00:00
Dongwon Kang
b55c7517ba TIF: Address API review comments
Bug: 27386052
Change-Id: I242819e0817723e247b8fe646d534899ab50af76
2016-03-01 10:03:58 -08:00
Hangyu Kuang
3e0127f5d5 Merge "Update Android mediamuxer documentation." into nyc-dev 2016-03-01 17:18:15 +00:00
Ronghua Wu
78614f7714 Merge "media: define HEVCProfileMain10HDR10" into nyc-dev 2016-03-01 16:35:22 +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
6430b15495 Merge "Add javadocs to MediaCodec.CryptoInfo methods" into nyc-dev 2016-03-01 02:26:30 +00:00
Lajos Molnar
063a570ef0 Merge "media: switch to using MediaImage2" into nyc-dev 2016-03-01 00:40:30 +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
Yujie Qin
42d8b7d7ab Merge "Use new API from PIEX" into nyc-dev 2016-02-29 08:21:52 +00:00
Sungsoo Lim
6316ac7992 MediaBrowser: Copy options before using it in subscribe()
Bug: 27398805
Change-Id: Ib3039b77838c9acae4706bb5532226bf8adc6d0e
2016-02-29 16:30:42 +09:00
Insun Kang
7c090d54e2 Annotate Media section of framework/base
Use @IntDef and @StringDef annotations where appropriate to ensure that
IDEs can autocomplete to the correct set of constants.

Bug: 22726900
Change-Id: I7626beb0634b754ffea9c012f42e6a21aa0faa51
2016-02-29 16:06:27 +09:00
Sungsoo Lim
ab19dc8e14 MediaBrowser: Fix Javadoc
Bug: 27384292
Change-Id: I57ddfaea0fe888665bc7ee88cd933a660c26f1a6
2016-02-29 14:03:48 +09:00
Eino-Ville Talvala
0d0625993a Merge "Media.effect: Remove redundant package info" into nyc-dev 2016-02-28 05:10:58 +00:00
Eino-Ville Talvala
4002b32d3d Media.effect: Remove redundant package info
It causes docs build warnings, isn't used, and is out of date.

Bug: 26856434
Change-Id: I9c77b5dadd571bca94ba091f86557e12459a373c
2016-02-27 17:57:23 -08: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
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
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
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
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
9b09e533ac JNI plumbing for native audio routing API
Bug: 23899814
Change-Id: I3a831bb661fbdfe1981ae3482fcc8773c7df22b6
2016-02-26 10:15:07 -07: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
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