Jean-Michel Trivi
fb7a388b9d
Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"
...
am: 4f9c05c382
2016-03-07 21:11:44 +00:00
Jean-Michel Trivi
4f9c05c382
Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"
...
This reverts commit 99278e1c72431ec6cdb9
2016-03-07 21:00:25 +00:00
Jean-Michel Trivi
cffe9145ec
Merge "Rename AudioRecordConfiguration to AudioRecordingConfiguration" into nyc-dev am: 46f5429768
...
am: b4a08fbd00
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
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
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
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
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
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
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
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
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
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
2016-03-02 08:27:01 +00:00
Jeff Sharkey
d1be3e0bdf
Merge "When system server goes down, crash apps more." into nyc-dev am: 60b7bcc614
...
am: 33a64f5e56
2016-03-02 06:57:26 +00:00
Insun Kang
50a9af14c5
Merge "Annotate Media section of framework/base" into nyc-dev am: 542221d68a
...
am: af79855f84
2016-03-02 06:46:41 +00:00
Sungsoo Lim
64f16f1dc1
MediaBrowserService: Make SubscriptionCallback.onError be called
...
Bug: 26733259
Change-Id: I8324e1c56e87071e781550ac0701e632a4122e73
2016-03-02 14:08:18 +09:00
Dongwon Kang
176facba14
Merge "TIF: Address API review comments" into nyc-dev
...
am: 9cd89a403ef6c9dc9594
2016-03-01 20:48:50 -08: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
Dongwon Kang
9cd89a403e
Merge "TIF: Address API review comments" into nyc-dev
2016-03-01 22:11:47 +00:00
Phil Burk
f5b8848184
Merge "AudioTrack: docs for getUnderrunCount()" into nyc-dev am: 88353459e2
...
am: f1bc7deffc
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
Dongwon Kang
b55c7517ba
TIF: Address API review comments
...
Bug: 27386052
Change-Id: I242819e0817723e247b8fe646d534899ab50af76
2016-03-01 10:03:58 -08:00
Hangyu Kuang
44ad2a94f9
Merge "Update Android mediamuxer documentation." into nyc-dev am: 3e0127f5d5
...
am: 72c713adda
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
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
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
