drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,685 Commits 1 Branch 0 Tags
Commit Graph

6497 Commits

Author SHA1 Message Date
James Dong
aef4af4cd1 Merge "Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java class" into jb-mr1-dev 2012-08-08 11:38:05 -07:00
James Dong
a35379ae98 Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java class 
o As a result, applications can listen for death notification from MediaRecorder onError callbacks

Change-Id: I49896c4ae8130bd67b52deff6eb97a22b43d3f32
 2012-08-07 19:15:35 -07:00
Mike Lockwood
2d286f4984 MediaFile: Fix case sensitive file extension matching for computing MTP format code 
Bug: 6939136

Change-Id: Iefd4083aefbd4b175a2f8c860a9e13c99ded9c82
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2012-08-07 14:43:59 -07:00
Martin Storsjo
d932de9aff mediacodec: Don't crash if trying to open a codec that does not exist 
Change-Id: If75e3156517993629f50622a84a9ac573fced815
 2012-08-07 11:11:24 -07:00
Martin Storsjo
b529e4c9ca mediacodec: Don't suggest calling getOutputFormat() immediately 
Calling getOutputFormat() at this point currently crashes in
native code. (After a fix to the native code, this gives an
IllegalStateException instead.)

Change-Id: Ia45c4820bb3d9ed435a0aeef1ff8c230524f2e1f
 2012-08-07 11:07:12 -07:00
Marco Nelissen
8ab2dc2f96 Improve scan time for some cases 
When the path being matched has a sqlite wildcard character in it, a "like"
match will be quite slow. Unfortunately this is fairly common, since "_"
is a wildcard character. However, because in most cases the case of the path
in the database will match the case on disk, an "=" match will work, so it
is worthwhile to try an "=" match first, before trying a "like".

If there are no wildcard characters, the "like" will be as fast as the "=",
because of the case-insensitive index on the _data column, so there is no
need to try "=" first in that case.

b/6751354

Change-Id: I1cd4efbd56a37886cb44a86acb73eb9a3c9f303d
 2012-08-02 12:32:05 -07:00
James Dong
9984833191 Added a key to retrieve the rotation angle in MediaMetadataRetriever.java class 
o related-to-bug: 6872687

Change-Id: I94569bb8357c39e8309974ede8284b33a996866c
 2012-07-31 14:50:49 -07:00
James Dong
b10ec1f4b1 Fix a typo (dependant => dependent) 
Change-Id: I0337bec1a26e852c32ea9f1ce54f270f79ee3ab1
 2012-07-30 15:45:50 -07:00
Jean-Michel Trivi
1f9196a8e5 Relax rules for media apps to stay on RemoteControlDisplay 
The playback of notification would make the display of the
 RemoteControlClient disappear from the lockscreen.

Fixed by modifying which AudioFocus owner to consider when
 reevaluating how the RemoteControlDisplay needs to be updated:
 use the first (starting from the top of the AudioFocus stack) that
 uses STREAM_MUSIC, or that uses any other stream type for a short
 period.

Change-Id: Id7cef00c5eed1f6ebfa59634eea8e2c9b2f3f5eb
 2012-07-27 11:34:02 -07:00
Jean-Baptiste Queru
33806e25b1 Remove unnecessary stagefright notices 
They now live in frameworks/media

Change-Id: Ic8b457c422359f260d6a1fed8c499b74aa9c6491
 2012-07-26 14:10:16 -07:00
Jeff Smith
ddd88726a2 am 71930dd7: am a45746ef: Fix several cases of broken droiddoc syntax external issue 35214 
* commit '71930dd77e4dc6f6be5c648019d2ab0da5f0584c':
  Fix several cases of broken droiddoc syntax external issue 35214
 2012-07-25 15:05:23 -07:00
Jeff Smith
71930dd77e am a45746ef: Fix several cases of broken droiddoc syntax external issue 35214 
* commit 'a45746efadd11bb7dfab026fb3c81a25fae74ca4':
  Fix several cases of broken droiddoc syntax external issue 35214
 2012-07-25 10:56:03 -07:00
Jeff Smith
a45746efad Fix several cases of broken droiddoc syntax 
external issue 35214

patch contributed by Jeff Smith <whydoubt@yahoo.com>

Change-Id: I70dcee88a140699bf3e1ab369bed6dcd2fdd3d83
 2012-07-25 10:49:25 -07:00
James Dong
15a89e6b48 Added MEDIA_INFO_VIDEO_RENDERING_START as an informational event 
o MEDIA_INFO_VIDEO_RENDERING_START indicates that the player just pushed the very first video frame
  of a video source for rendering.

Change-Id: I32dad93990f5d48b70fc79d841ca3ce3b1af4027
related-to-bug: 6851811
 2012-07-23 15:47:27 -07:00
James Dong
c64c1cbef4 am d1a0a53e: am 5d478b9c: Merge "Changed to obtain a parcel in each notify() call in jni." into jb-dev 
* commit 'd1a0a53eec141b615697652b3a8907a60298a414':
  Changed to obtain a parcel in each notify() call in jni.
 2012-07-18 20:18:41 -07:00
James Dong
d1a0a53eec am 5d478b9c: Merge "Changed to obtain a parcel in each notify() call in jni." into jb-dev 
* commit '5d478b9c1009b077649f7f870d993832d380d63c':
  Changed to obtain a parcel in each notify() call in jni.
 2012-07-18 20:15:11 -07:00
James Dong
5d478b9c10 Merge "Changed to obtain a parcel in each notify() call in jni." into jb-dev 2012-07-18 18:43:37 -07:00
Adam Powell
41a48e4a99 am c36b8acd: am 38895394: Merge "Properly switch MediaRouter to wired audio over a2dp." into jb-dev 
* commit 'c36b8acd1e850619de0bbf678b9573d4d761d836':
  Properly switch MediaRouter to wired audio over a2dp.
 2012-07-16 17:36:49 -07:00
Adam Powell
c36b8acd1e am 38895394: Merge "Properly switch MediaRouter to wired audio over a2dp." into jb-dev 
* commit '388953942b536b5eebd942ef78ae5b7499bc2078':
  Properly switch MediaRouter to wired audio over a2dp.
 2012-07-16 17:33:40 -07:00
Adam Powell
bcf21e913a Properly switch MediaRouter to wired audio over a2dp. 
The system gives priority to physically connected
headphones/speakers/docks/etc. Reflect this in MediaRouter and
associated UI.

Bug 6777592

Change-Id: Ibabf3d7512207117e892c99f004443490c3d0612
 2012-07-12 16:53:04 -07:00
Yu Shan Emily Lau
0fb362b41e am 413b5c19: am 10366b93: Merge "Remove the unnecssary intent call." into jb-dev 
* commit '413b5c19a681bb4fda4cc5a6e8347d37792aa905':
  Remove the unnecssary intent call.
 2012-07-10 16:51:20 -07:00
Yu Shan Emily Lau
413b5c19a6 am 10366b93: Merge "Remove the unnecssary intent call." into jb-dev 
* commit '10366b93157718ed8621f5af087e7a771191b41a':
  Remove the unnecssary intent call.
 2012-07-10 16:49:31 -07:00
Yu Shan Emily Lau
10366b9315 Merge "Remove the unnecssary intent call." into jb-dev 2012-07-10 16:47:09 -07:00
Yu Shan Emily Lau
e60393ae71 Remove the unnecssary intent call. 
Change-Id: Ia0a460ca8532ccb2f4b0f0205d192b1ba907b5b6
 2012-07-10 16:45:38 -07:00
Jean-Michel Trivi
f2b0c11f4e Fix sound effect attenuation calculation 
The sound effect volume attenuation calculation is wrong: the
 division by 20 was always returning 1 or 0.
In AudioService, rename the sound effect attenuation value to
 follow the naming conventions for static variables.

Change-Id: I3c36d50f4470ff09ca98cb944aefb5ad0f968782
 2012-07-10 13:24:23 -07:00
Eric Laurent
28b7809e30 Merge "AudioService: fix a2dp force use delay" 2012-07-10 09:46:54 -07:00
Insun Kang
333c09945e Changed to obtain a parcel in each notify() call in jni. 
Change-Id: I5faf0f5d1fdf76a5b4bd1cff37aa58df79d18e85
related-to-bug: 6785452
 2012-07-10 22:23:01 +09:00
Eric Laurent
c390bed06b AudioService: fix a2dp force use delay 
Fixed setBluetoothA2dpOnInt() so that AudioSystem.setForceUse()
is called synchronously and not via a message.

This is because the order in which setForceUse() and setDeviceConnectionState()
are executed is important to avoid audio glitches when called from
onSetWiredDeviceConnectionState().

Bug 6720482.

Change-Id: I09c975d1108fd38f31b047c082acdf944ab790a7
 2012-07-09 10:50:37 -07:00
Scott Main
9b52b9c83d am 7b5488d8: am 099fd80f: docs: add throws notice for isPlaying per external issue 33610 
* commit '7b5488d85d8ed36c42a821fb0064de741cca35c9':
  docs: add throws notice for isPlaying per external issue 33610
 2012-07-03 17:42:37 -07:00
Scott Main
7b5488d85d am 099fd80f: docs: add throws notice for isPlaying per external issue 33610 
* commit '099fd80f984b8493de58bdda8ea05563261b0af2':
  docs: add throws notice for isPlaying per external issue 33610
 2012-07-03 17:39:25 -07:00
Scott Main
099fd80f98 docs: add throws notice for isPlaying 
per external issue 33610

Change-Id: Ibd778cb4ecc5f1717fa007ac069a7b3660ec4794
 2012-07-03 17:32:23 -07:00
Scott Main
f16b211ebf am 00a82605: am f443c5ea: Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev 
* commit '00a82605a17360f5b9005035a75d779a231d5a5c':
  Minor corrections to the javadoc overview to reflect late API changes.
 2012-06-28 12:06:39 -07:00
Scott Main
00a82605a1 am f443c5ea: Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev 
* commit 'f443c5ea2c67285322d4790e5bee4c3c6f6af1ae':
  Minor corrections to the javadoc overview to reflect late API changes.
 2012-06-28 12:04:04 -07:00
Scott Main
f443c5ea2c Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev 2012-06-28 12:00:49 -07:00
Andreas Huber
2ac3f2e285 Minor corrections to the javadoc overview to reflect late API changes. 
Change-Id: If64e7ea0fa9c892d728282e5e18547a4da115989
 2012-06-27 11:46:21 -07:00
Mike Lockwood
68ff8cbc38 am 1524e625: am 7017d51e: Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev 
* commit '1524e625067da52e1365e4f939d4683edeea2fd5':
  MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes
 2012-06-26 17:01:53 -07:00
Mike Lockwood
1524e62506 am 7017d51e: Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev 
* commit '7017d51e147a0f6ed2370fb79c656c9726304131':
  MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes
 2012-06-26 16:59:07 -07:00
Mike Lockwood
7017d51e14 Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev 2012-06-26 16:57:02 -07:00
Mike Lockwood
1e855d98aa MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes 
Bug: 6684451

Change-Id: I90204550ccfcd1b7a5b1973bed2a88e934aae053
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2012-06-26 16:33:05 -07:00
Andreas Huber
7b10a492bc am 6dfd6aec: am c8c5e98b: Merge "Document some of the more common mimetypes to be used when instantiating" into jb-dev 
* commit '6dfd6aec2730bfdde6da646dafa8597a34a17b4e':
  Document some of the more common mimetypes to be used when instantiating
 2012-06-25 14:56:06 -07:00
Andreas Huber
6dfd6aec27 am c8c5e98b: Merge "Document some of the more common mimetypes to be used when instantiating" into jb-dev 
* commit 'c8c5e98b9ea0be4d161382fc537955d505e65a6c':
  Document some of the more common mimetypes to be used when instantiating
 2012-06-25 14:53:07 -07:00
Andreas Huber
68b1a6eed8 Document some of the more common mimetypes to be used when instantiating 
MediaCodec components.

Change-Id: I810507d1d76a28666eb6fb63e3b597d38e5f1389
 2012-06-25 14:38:16 -07:00
Adam Powell
c497bc69e9 am 3c419da6: am dbbfa702: Fix MediaRouter bugs 
* commit '3c419da632c7f332a50e5001331544cb8c919dce':
  Fix MediaRouter bugs
 2012-06-24 14:59:03 -07:00
Adam Powell
3c419da632 am dbbfa702: Fix MediaRouter bugs 
* commit 'dbbfa702a09f6d2d36dee1b552442d04a4673f89':
  Fix MediaRouter bugs
 2012-06-24 14:56:06 -07:00
Adam Powell
dbbfa702a0 Fix MediaRouter bugs 
Fix a bug where a newly added group had no supported types at the time
of callback dispatch, meaning that no registered callbacks would be
invoked.

Fix a bug where subscribed type flags were not updated properly when
re-adding a callback for new types.

Change-Id: I7d9f11b363ebdca692786cec1d432600946e5721
 2012-06-24 14:32:04 -07:00
Adam Powell
0c26f97684 am 3b939b72: am fd3fd482: Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev 
* commit '3b939b7242f9c4155f4d8b34cb474abc77c6417f':
  Update route count properly when MediaRouteButton detects grouped/ungrouped events
 2012-06-23 05:39:23 -07:00
Adam Powell
3b939b7242 am fd3fd482: Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev 
* commit 'fd3fd482ab6ab67b687696f51fa67714bd36fa49':
  Update route count properly when MediaRouteButton detects grouped/ungrouped events
 2012-06-23 05:36:54 -07:00
Adam Powell
f3b653a21c Update route count properly when MediaRouteButton detects 
grouped/ungrouped events

Change-Id: I1b00678cc3b548f347c51c3fcbfce18ecc8fbabe
 2012-06-22 19:22:38 -07:00
Adam Powell
c7be481af1 am fd7ea067: am d7c00d2b: Merge "MediaRouter group volume reporting" into jb-dev 
* commit 'fd7ea06787f0be4def188621888d228f38f3a4d1':
  MediaRouter group volume reporting
 2012-06-21 12:03:55 -07:00
Adam Powell
fd7ea06787 am d7c00d2b: Merge "MediaRouter group volume reporting" into jb-dev 
* commit 'd7c00d2bdd011d3a73faf1c4a5bb8012d24dd648':
  MediaRouter group volume reporting
 2012-06-21 11:52:19 -07:00