Paul McLean
0d39df92eb
Merge "Make native_release() methods in AudioTrack and AudioRecord JNI-callable." into nyc-dev am: 70612efe65
...
am: 7d0473c569
* commit '7d0473c569667735e4a63b4ed6b7ae4577504eeb':
Make native_release() methods in AudioTrack and AudioRecord JNI-callable.
2016-03-09 00:32:34 +00:00
Paul Mclean
70612efe65
Merge "Make native_release() methods in AudioTrack and AudioRecord JNI-callable." into nyc-dev
2016-03-09 00:00:08 +00:00
Jae Seo
18fa3cc259
Merge "TIF: Drop the requirement for ID tuple for non-broadcast channels" into nyc-dev am: e75f77326e
...
am: 83f70c1042
* commit '83f70c1042760290eb17e2d25aaa2176b7c1fe76':
TIF: Drop the requirement for ID tuple for non-broadcast channels
2016-03-08 23:18:51 +00:00
Jae Seo
e75f77326e
Merge "TIF: Drop the requirement for ID tuple for non-broadcast channels" into nyc-dev
2016-03-08 22:49:30 +00:00
Paul McLean
c69ac54111
Make native_release() methods in AudioTrack and AudioRecord JNI-callable.
...
Change-Id: I31f8946579438021ba8f7ec58bf301a190082063
2016-03-08 15:47:35 -07:00
Dongwon Kang
33315dbb4f
Merge "TIF: Unhide TvView.setZOrderMediaOverlay/setZOrderOnTop/tune/unblockContent" into nyc-dev am: 08713d2a0e
...
am: 77e46befc8
* commit '77e46befc8ce665d88c22d34d500d1e3b24c8c7a':
TIF: Unhide TvView.setZOrderMediaOverlay/setZOrderOnTop/tune/unblockContent
2016-03-08 22:45:03 +00:00
Dongwon Kang
08713d2a0e
Merge "TIF: Unhide TvView.setZOrderMediaOverlay/setZOrderOnTop/tune/unblockContent" into nyc-dev
2016-03-08 22:11:13 +00:00
Jae Seo
c0e5873599
TIF: Drop the requirement for ID tuple for non-broadcast channels
...
This has been causing some confusion among streaming-based channel app
developers without having any clear benefit, hence drop the requirement.
Bug: 27536480
Change-Id: I51be65ccc402171a0ce34ae4640905ec48d39e37
2016-03-08 11:41:29 -08:00
Dongwon Kang
e12d810e99
TIF: Unhide TvView.setZOrderMediaOverlay/setZOrderOnTop/tune/unblockContent
...
Bug: 25726685
Change-Id: If96d0b086488c931d20315ee1c29cf7374715d93
2016-03-08 10:53:09 -08:00
Jean-Michel Trivi
92b473df6c
Merge "Rename AudioRecordConfiguration to AudioRecordingConfiguration" into nyc-dev am: 84dee4f16c
...
am: 2392ab9bbd
* commit '2392ab9bbd30ed5ffcab00aec1bb6b46552c484f':
Rename AudioRecordConfiguration to AudioRecordingConfiguration
2016-03-08 17:03:35 +00:00
Jean-Michel Trivi
84dee4f16c
Merge "Rename AudioRecordConfiguration to AudioRecordingConfiguration" into nyc-dev
2016-03-08 16:46:58 +00:00
Jae Seo
707bc796fb
Merge "TIF: Add more comments for TvInputInfo/TvTrackInfo" into nyc-dev am: 3c420f669b
...
am: 5840ce60d9
* commit '5840ce60d9353c16e685915c2d5d26c8ebffbdc4':
TIF: Add more comments for TvInputInfo/TvTrackInfo
2016-03-08 05:50:09 +00:00
Jae Seo
6256e27c1b
TIF: Add more comments for TvInputInfo/TvTrackInfo
...
- Documented what TvInputInfo.getTunerCount returns if the input is not
of TYPE_TUNER.
- Documented what all getters/setters in TvTrackInfo throw if not called
on proper types.
Bug: 27531254
Change-Id: I32d83ce888507ec29cda8dce74871a3d55783766
2016-03-07 20:09:43 -08:00
Sungsoo Lim
7b5b3a1a4f
Merge "MediaBrowser: Copy options before using it in subscribe()" into nyc-dev am: e10739ab8b
...
am: b828147539
* commit 'b828147539fc4bab13d87d12850531012f165739':
MediaBrowser: Copy options before using it in subscribe()
2016-03-08 01:52:06 +00:00
Sungsoo Lim
e10739ab8b
Merge "MediaBrowser: Copy options before using it in subscribe()" into nyc-dev
2016-03-08 01:46:13 +00:00
Jean-Michel Trivi
598c0c9f65
Rename AudioRecordConfiguration to AudioRecordingConfiguration
...
In package android.media:
- rename AudioRecordConfiguration to
AudioRecordingConfiguration to avoid ambiguity with the
android.media.AudioRecord class
- rename AudioManager.getActiveRecordConfigurations() to
getActiveRecordingConfigurations.
Bug 27385560
Change-Id: I5ef404ff36522193990c9b563d4545893529b365
2016-03-07 16:05:51 -08:00
Jean-Michel Trivi
fb7a388b9d
Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"
...
am: 4f9c05c382
* commit '4f9c05c3823ea73b17fb6b14707dc2ce3f9d760c':
Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"
2016-03-07 21:11:44 +00:00
Jean-Michel Trivi
4f9c05c382
Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"
...
This reverts commit 99278e1c72 .
Change-Id: Ifcb3f17a26df8171cbc21dac093477b98a1333db
(cherry picked from commit 431ec6cdb9 )
2016-03-07 21:00:25 +00:00
Jean-Michel Trivi
310355d28e
Merge "Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"" into nyc-dev
2016-03-07 19:59:42 +00:00
Jean-Michel Trivi
431ec6cdb9
Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"
...
This reverts commit 99278e1c72 .
Change-Id: Ifcb3f17a26df8171cbc21dac093477b98a1333db
2016-03-07 19:59:21 +00:00
Jean-Michel Trivi
cffe9145ec
Merge "Rename AudioRecordConfiguration to AudioRecordingConfiguration" into nyc-dev am: 46f5429768
...
am: b4a08fbd00
* commit 'b4a08fbd00d631f8f2508915e9d04c0ed9650d16':
Rename AudioRecordConfiguration to AudioRecordingConfiguration
2016-03-07 19:53:33 +00:00
Jeff Tinker
a531724c88
Merge "Add error code to MediaCodec.CryptoException" into nyc-dev am: b849eeab26
...
am: d83f4fc837
* commit 'd83f4fc837cf344c81def1284aa1af8757703b3e':
Add error code to MediaCodec.CryptoException
2016-03-07 19:42:11 +00:00
Jean-Michel Trivi
46f5429768
Merge "Rename AudioRecordConfiguration to AudioRecordingConfiguration" into nyc-dev
2016-03-07 19:29:04 +00:00
Jeff Tinker
b849eeab26
Merge "Add error code to MediaCodec.CryptoException" into nyc-dev
2016-03-07 18:18:10 +00:00
Insun Kang
f2045ae751
Merge "Fix wrong metadata conversion in MediaSessionLegacyHelper" into nyc-dev am: bf8ff76fee
...
am: f6e1f29da9
* commit 'f6e1f29da9204a615fc7a201e811c7149ea645f7':
Fix wrong metadata conversion in MediaSessionLegacyHelper
2016-03-07 06:37:56 +00:00
Insun Kang
bf8ff76fee
Merge "Fix wrong metadata conversion in MediaSessionLegacyHelper" into nyc-dev
2016-03-07 06:31:22 +00:00
Jeff Sharkey
16ba77f20c
Merge "Set default ringtones through RingtoneManager." into nyc-dev am: 0f905b3db2
...
am: 6102dca518
* commit '6102dca518eda6cf39b68e61a650a268a04d1666':
Set default ringtones through RingtoneManager.
2016-03-06 01:00:54 +00:00
Jeff Sharkey
0f905b3db2
Merge "Set default ringtones through RingtoneManager." into nyc-dev
2016-03-06 00:50:20 +00:00
Jeff Sharkey
9dd3b2162d
Set default ringtones through RingtoneManager.
...
RingtoneManager is the public API that everyone should be going
through, and it now has the side-effect of caching the set ringtone
to make it available before CE storage is unlocked.
Bug: 27435331
Change-Id: I30ed4e2df2ef1e4fd47f947c70845aaa74356384
2016-03-05 17:43:22 -07:00
Jeff Sharkey
40e5feaf8f
Merge "Ask RingtonePlayer to open data for caching." into nyc-dev am: b94f2df289
...
am: 12e2778307
* commit '12e2778307f39564edf52ea94cecd577bfc3d1ee':
Ask RingtonePlayer to open data for caching.
2016-03-06 00:34:24 +00:00
Jeff Sharkey
b94f2df289
Merge "Ask RingtonePlayer to open data for caching." into nyc-dev
2016-03-06 00:29:01 +00:00
Jeff Sharkey
783ee0ca87
Ask RingtonePlayer to open data for caching.
...
When setting default ringtones, RingtoneManager now caches the
selected media for playback before the device is unlocked. However,
this API hasn't historically required the caller to hold storage
permissions.
To keep this working, we attempt to delegate ringtone access over
through RingtonePlayer, which is what we do for playback. However,
because we're caching the real ringtone bits now, we need to be much
more careful about the PFDs we're willing to return. This change
requires that they be in external storage, and that they have the
ringtone/alarm/notification bit set.
Bug: 27366059
Change-Id: I59c2adc1d1250a3eac281f190f35a7cb3119967b
2016-03-05 17:23:32 -07:00
Jeff Sharkey
130b5bc14c
Merge "Add AssetFileDescriptor to MediaExtractor." into nyc-dev am: d6de3abed9
...
am: 24219954ec
* commit '24219954ec49dfdc4ae4d10571ecc02e67a7272b':
Add AssetFileDescriptor to MediaExtractor.
2016-03-05 23:17:14 +00:00
Jeff Sharkey
d6de3abed9
Merge "Add AssetFileDescriptor to MediaExtractor." into nyc-dev
2016-03-05 23:09:25 +00:00
Jeff Sharkey
a3c1c2297d
Add AssetFileDescriptor to MediaExtractor.
...
Mirrors API on MediaPlayer.
Bug: 27506874
Change-Id: Ibc07cf8151c362ff7375b89e7a9044bef1d9e94d
2016-03-05 16:07:46 -07:00
Jeff Tinker
d393216f8a
Add error code to MediaCodec.CryptoException
...
Added a code to represent unsupported operations
bug: 25929554
Change-Id: Id8bfa092f29de073db19c4d7444f89249ea2cdd5
2016-03-05 11:53:23 -08:00
Jean-Michel Trivi
46ef3bdf28
Merge "API changes for audio recording notifications" into nyc-dev am: b74926232e
...
am: 6bc51e0e5c
* commit '6bc51e0e5cb318bc9c1c92a1f70a434614a741fc':
API changes for audio recording notifications
2016-03-04 22:56:10 +00:00
Jean-Michel Trivi
b74926232e
Merge "API changes for audio recording notifications" into nyc-dev
2016-03-04 22:49:31 +00:00
Sungsoo Lim
76dbe90a53
Merge "MediaBorwserService: Update javadoc" into nyc-dev am: bb71aed9ac
...
am: f58507f892
* commit 'f58507f89230f8aebb47e7673ae9c43c9c8c9805':
MediaBorwserService: Update javadoc
2016-03-04 05:59:02 +00:00
Sungsoo Lim
97243a8ff2
MediaBorwserService: Update javadoc
...
Bug: 26733259
Change-Id: I7240149c0cbbacf221e466908e6ebc201d603c5f
2016-03-04 14:47:23 +09:00
Wei Jia
08dc8c0432
Merge "MediaPlayer: use local variable to check member is null." into nyc-dev am: ebdc198e2f
...
am: 13c6b61616
* commit '13c6b61616d43912996be3302ab2d02ca2b51a99':
MediaPlayer: use local variable to check member is null.
2016-03-03 21:39:31 +00: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
2eb0376310
Merge "media: Add track ID format key" into nyc-dev am: 4ab9756906
...
am: 03b81e8084
* commit '03b81e8084d7785e68b4bb80d799dbf4b0d40a14':
media: Add track ID format key
2016-03-03 16:20:35 +00: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
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
Insun Kang
c9763d766c
Fix wrong metadata conversion in MediaSessionLegacyHelper
...
Bug: 27447464
Change-Id: I4d2ec5b3fe480636dcc76b1f3a4f0b1a110defae
2016-03-02 23:30:53 +09:00
Sungsoo Lim
54d29bb301
Merge "MediaBrowserService: Make SubscriptionCallback.onError be called" into nyc-dev am: 4a67d975e4
...
am: bc287ddd15
* commit 'bc287ddd15c3b650bd38f64fd6ed37ee2851c47d':
MediaBrowserService: Make SubscriptionCallback.onError be called
2016-03-02 08:27:01 +00:00