73699 Commits

Author SHA1 Message Date
Colin Cross
73ed17cbaf Merge "move dumpstate and dumpsys from frameworks/base to frameworks/native" 2012-03-26 12:50:24 -07:00
Colin Cross
1249851540 Merge "stagefright: compile without chromium for pdk builds" 2012-03-26 12:40:52 -07:00
Fabrice Di Meglio
9b0e599120 Merge "Fix View textDirection refresh" 2012-03-26 12:40:35 -07:00
Colin Cross
b347e33daf move dumpstate and dumpsys from frameworks/base to frameworks/native
Change-Id: Ifdff51a974a9ee3c8ee7b04648a45d2f278ce4df
2012-03-26 12:39:38 -07:00
Glenn Kasten
8296628ed8 Merge "mv libcpustats from frameworks/base to /native" 2012-03-26 12:28:38 -07:00
Colin Cross
0821013609 stagefright: compile without chromium for pdk builds
Change-Id: I7d85e04fb9f0caa8460a111ca6181bba6f6497ac
2012-03-26 12:24:52 -07:00
Glenn Kasten
30b8a65c5c mv libcpustats from frameworks/base to /native
OK to lose history

Change-Id: I05ce0452f16a396cff6e18db5424492f3a6f6861
2012-03-26 12:22:57 -07:00
Fabrice Di Meglio
827d5c09fb Fix View textDirection refresh
- the refresh was no more done correctly after the use of display lists

Change-Id: I5c74bbe565c603fe2e7fd793dd49c3b20036e04b
2012-03-26 12:15:42 -07:00
Craig Mautner
a2c77053b8 Refactor animation out of WindowState.
Remove the animation stepping from WindowState and move it into a new
class, WindowStateAnimator. Update all references to moved variables
in related files.

Change-Id: I7540d8f897b370c73975f3ffe450140861cb0cd1
2012-03-26 12:14:43 -07:00
Scott Main
7fa4a28e1e docs: add Coolpad to oem driver list
Change-Id: I0cb6267a35d9a691c6cacea471a9fca9d5dc61b8
2012-03-26 12:12:24 -07:00
Andreas Huber
b3e2e24f78 Merge "Provisional support for secure decryption of media streams." 2012-03-26 11:43:06 -07:00
James Dong
61bf87428c Merge "Removed code related to simulator build in TimedEventQueue to get rid of the dependency on jni.h" 2012-03-26 11:41:21 -07:00
Michael Jurka
dcbe048f4d Merge "Fix bug: don't show system bar in app thumbnails" 2012-03-26 11:29:09 -07:00
Eric Laurent
a561965842 Merge "fix visualizer inactivity detection" 2012-03-26 11:27:41 -07:00
Andreas Huber
9b8e496f4d Provisional support for secure decryption of media streams.
Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
2012-03-26 11:24:04 -07:00
Eric Laurent
383c4b3e63 Merge "reorganize SoundPool and JetPlayer code." 2012-03-26 11:23:49 -07:00
Colin Cross
56ca534e65 Merge changes Ib4d0e0c0,Iea8f4a23
* changes:
  libmedia: remove skia include
  stagefright: remove dependency on skia
2012-03-26 11:22:29 -07:00
James Dong
6e43c1b51b Removed code related to simulator build in TimedEventQueue to get rid of the dependency on jni.h
o related-to-bug: 6214141

Change-Id: I548d84a9888be884d3903dc9dea9235258792165
2012-03-26 11:18:35 -07:00
Dianne Hackborn
eba00ce996 Merge "Okay now let's really turn it off." 2012-03-26 11:12:28 -07:00
Eric Laurent
b460566388 fix visualizer inactivity detection
Current method implemented by the visualizer to detect that audioflinger has
stopped providing audio buffers does not work if the application
reads pcm captures too fast.

The fix consist in implementing a method based on real time measurement only.
One drawback is that the new method makes use of system calls that add some
overhead to the process and capture functions.

Change-Id: I53bd596b856f1cc7f0f47e08413af3335227100b
2012-03-26 11:05:25 -07:00
Steve Block
f2bfe2bc05 Remove superfluous code after removal of Android HTTP stack
See b/5495616.

Bug: 6228353
Change-Id: I16cfd7b37973919d5bf14d2d80954caede264961
2012-03-26 19:05:14 +01:00
Eric Laurent
f5e1812549 reorganize SoundPool and JetPlayer code.
Reorganize SoundPool and JetPlayer code to be ready for the
creation of libmedia_native.

Split SoundPool between libsoundpool (JNI) and libmedia(sound pool implementation).
Remove dependencies on nativehelper/jni.h from JetPlayer.

Change-Id: I130c6014173b714329929dd82c5dfb70b757a610
2012-03-26 10:54:41 -07:00
Dianne Hackborn
69dc66e91b Okay now let's really turn it off.
Change-Id: Idda3c13339a6a29a300555d31e67219c9af4ae68
2012-03-26 10:50:54 -07:00
Dianne Hackborn
a026b48972 Merge "Turn off "too slow" logs." 2012-03-26 10:40:50 -07:00
Dianne Hackborn
551d0b1f2a Turn off "too slow" logs.
Change-Id: I6ec306ca1c55226269c4644a869a984c4fa00f0d
2012-03-26 10:25:59 -07:00
Jesse Wilson
e300d82828 Merge "Add an API to expose Next Protocol Negotiation (NPN)." 2012-03-26 10:14:44 -07:00
Michael Jurka
4accb6a88b Fix bug: don't show system bar in app thumbnails
Bug: 5953608
Change-Id: Ib730638fe130f287ff446db0c6cd42efc5746c5c
2012-03-26 09:42:35 -07:00
Victoria Lease
6af84f678d Merge "move FindListener into WebView" 2012-03-26 09:13:08 -07:00
Nick Kralevich
c610a6bac7 Merge "resist umask changes, make dirs 0711" 2012-03-26 09:03:07 -07:00
Victoria Lease
d405a433e6 move FindListener into WebView
Also took advantage of the opportunity to adjust the javadoc.

Bug: 6052412
Change-Id: I3de2cc6f2b5af20acb87d6e0a105ac12b1be679b
2012-03-26 08:49:49 -07:00
Marco Nelissen
7061b5ffb3 Merge "Speed up playlist processing" 2012-03-26 07:36:41 -07:00
Glenn Kasten
4acee00352 Add TRACK_FAST for IAudioFlinger::createTrack
Currently not implemented by client or server

Change-Id: Ib11dda57db3eeb871bcc7b546e340078776875f5
2012-03-26 07:25:48 -07:00
Glenn Kasten
39581f9248 Merge "IAudioFlinger::createTrack and openRecord flags" 2012-03-26 07:16:37 -07:00
Daniel Sandler
9ea03b9f29 Merge "Add remotable methods for TextView's compound drawables." 2012-03-26 06:51:28 -07:00
Craig Mautner
c9f67764a8 Merge "Skip layout if performShow fails." 2012-03-25 22:01:18 -07:00
Craig Mautner
cf8cbbe774 Skip layout if performShow fails.
In cases where a Surface does not go from hidden to shown, do not set
the perform layout flag. This keeps us out of repeated passes through
the layout code.

Fixes bug 6222487.

Change-Id: I22601bef5733d2f996a8cbdd50d6b89517bc3122
2012-03-25 21:54:36 -07:00
satok
83e675f5ec Support UntranslatableReplacementStringInSubtypeName
Bug: 6210256

Change-Id: I54016f2dcfc6563ed3753e1d4fa1bbd2cfb9d08c
2012-03-26 12:30:23 +09:00
Jesse Wilson
f5fb5e8096 Add an API to expose Next Protocol Negotiation (NPN).
Bug: http://b/4190756
Change-Id: If904f7ff440391a6adb2963eb2ecb990140ab7cc
2012-03-25 19:43:01 -04:00
Joe Malin
7e25805dd6 am 5d181a39: am 093ed383: Merge "DOC CHANGE: IME subtype article" into ics-mr1
* commit '5d181a390b63970c08175afa64babb3dd46b11de':
2012-03-25 13:08:55 -07:00
Joe Malin
2249327207 am 8ea93aa6: am 093ed383: Merge "DOC CHANGE: IME subtype article" into ics-mr1
* commit '8ea93aa6adc0e46c8931d31d4f940cdde97c672f':
  DOC CHANGE: IME subtype article
2012-03-25 13:07:06 -07:00
Joe Malin
8ea93aa6ad am 093ed383: Merge "DOC CHANGE: IME subtype article" into ics-mr1
* commit '093ed3838c3f2847be1893ea49c6b15b90e0afc3':
  DOC CHANGE: IME subtype article
2012-03-25 13:04:59 -07:00
Joe Malin
5d181a390b am 093ed383: Merge "DOC CHANGE: IME subtype article" into ics-mr1
* commit '093ed3838c3f2847be1893ea49c6b15b90e0afc3':
  DOC CHANGE: IME subtype article
2012-03-25 13:04:58 -07:00
Joe Malin
093ed3838c Merge "DOC CHANGE: IME subtype article" into ics-mr1 2012-03-25 13:02:53 -07:00
Colin Cross
fe6ecdae58 libmedia: remove skia include
skia is not used in this file, remove the unnecessary include.

Change-Id: Ib4d0e0c0090c6b37ff8cfb816c0d8ba82a9638a4
2012-03-24 23:34:44 -07:00
Colin Cross
7c424a34d7 stagefright: remove dependency on skia
skia is only used to write a jpeg file, link directly to libjpeg
instead.

Change-Id: Iea8f4a2347c38328776541d2b74bcbdea3f62041
2012-03-24 23:34:43 -07:00
Colin Cross
8dd6574809 remove jni.h include from IOMX.h
jni.h is not used in IOMX.h and is not available in pdk builds,
remove it.

Change-Id: I9bc8fd70f617942712d9f684c6fc927bf18be753
2012-03-24 15:35:17 -07:00
James Dong
23918f2144 Merge "Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files." 2012-03-24 12:31:46 -07:00
James Dong
209cfdf4f6 Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files.
o related-to-bug: 6214141

Change-Id: Ic88d1732b3e014af47532a0809e01f6086e8464d
2012-03-24 10:59:14 -07:00
James Dong
062ed957e0 Fixed missing return value from a method should have returned status_t
Change-Id: I83ad2735eaf8a8dfa5f8f29f30aec1311b3222de
2012-03-24 10:15:18 -07:00
James Dong
3b3a5b100b Merge "VideoEditorMain.h is moved to /frameworks/av/libvideoeditor and thus can be deleted." 2012-03-24 09:57:06 -07:00