69495 Commits

Author SHA1 Message Date
Jack Palevich
8b854cd74b Remove EGL context limit for Adreno GPUs.
This change allows Adreno GPUs to have multiple EGL contexts. We had
to limit this in earlier versions of Android due to limitations in
the Adreno GPU driver (only 8 EGL contexts allowed system wide.)
That brand of GPU has improved its EGL drivers to support multiple
EGL contexts in more recent versions of their drivers used on more
recent versions of Android.

Bug: 6142005
Change-Id: Id3030466be9a3d9fbe728f1785378c1f05da98fe
2012-03-19 11:17:40 -07:00
Scott Main
6c25ffb770 am 0b4ec63c: am 6513bceb: am 7f949778: Merge "docs: remove link from GP logo" into ics-mr1
* commit '0b4ec63cd1fe09aec34d1eac8bc8f5cc28450f6c':
2012-03-15 11:17:27 -07:00
Scott Main
a993d4b85a am fb058ddb: am 82916294: am 7f949778: Merge "docs: remove link from GP logo" into ics-mr1
* commit 'fb058ddb8b76513911daba970fde6098290f61d1':
  docs: remove link from GP logo
2012-03-15 11:17:22 -07:00
Junichi Monma
77d3a7a06c am 896a638b: (-s ours) am 41d72c86: Merge "DO NOT MERGE : New version of DroidSansFallback font" into ics-scoop
* commit '896a638b34368f943a84e148a59f589ed172fbe1':
  DO NOT MERGE : New version of DroidSansFallback font
2012-03-15 11:17:19 -07:00
George Mount
f63c52ac87 Merge "Add scrolling editable text with a finger drag." 2012-03-15 10:54:30 -07:00
Eino-Ville Talvala
4d2ece12a6 Merge "Move CameraParameters.h to frameworks/native." 2012-03-15 10:34:00 -07:00
George Mount
f70276a259 Add scrolling editable text with a finger drag.
Bug 6156451

 WebKit change: Ie08712fb17b237fbb2d520d745ef8a2e489fd728

Change-Id: I1a16c708e5ea2ef8bd1f99197dacbc7831764ef4
2012-03-15 10:00:44 -07:00
Chet Haase
e82a54aedc Merge "Fix bug with transform Animations" 2012-03-15 09:25:35 -07:00
Chet Haase
bcbec0ccd0 Fix bug with transform Animations
A recent change to enable View properties at the native DisplayList level
mistakenly cuased Animation transforms get be ignored for any View with
a DisplayList. The correct code should have checked whether DL properties
were enabled for the view (disabled by default for now).

Issue #6173975 Animations are gone

Change-Id: I5d5f53f854fb1b533a3150158e84392d7283d2a8
2012-03-15 09:22:17 -07:00
Glenn Kasten
4513bc0f28 Merge "Remove dependency on audio_* location" 2012-03-15 07:53:54 -07:00
Jeff Brown
5571ffdd9d Merge "Prefetch column names in bulk cursor adaptor." 2012-03-14 18:56:07 -07:00
Jeff Brown
fb5a4964b8 Prefetch column names in bulk cursor adaptor.
If the remote end of a bulk cursor died, then it was possible
for getColumnNames() to return null, violating the invariant
that it never returns null.  As a result, the application could
crash in strange ways due to an NPE.

Since we are often interested in the column names anyhow, prefetch
them when setting up the bulk cursor adaptor.  This way, a
remote cursor will never return null even if the remote end died.

It is possible for an application to continue to use a remote cursor
even after the provider has died unless it needs to requery it
for some reason.  Of course at that point, bad things will
happen... but usually the app is better prepared for it than
if it just randomly encounters a null array of column names.

This change also optimizes the bulk cursor adaptor to return the
initial cursor window back to the client, potentially saving
an extra RPC.  Because the communication protocol between
the CursorToBulkCursorAdaptor and BulkCursorToCursorAdaptor was
getting a little hard to follow, introduced a new type called
BulkCursorDescriptor to hold all of the necessary parameters.

Deleted several unnecessary IBulkCursor methods that are never
actually called remotely.

Bug: 6168809
Change-Id: I9aaf6f067c6434a575e2fdbf678243d5ad10755f
2012-03-14 18:51:07 -07:00
James Dong
77cda104ac Merge "Defines MediaPlayer APIs to support multiple audio/video/timedtext tracks." 2012-03-14 17:45:18 -07:00
Romain Guy
d5bceea4bd Merge "Fix the build" 2012-03-14 17:38:32 -07:00
Romain Guy
06298b0e2d Fix the build
Change-Id: Ic3694c295e578f7c089e698dbcebdff685a7968f
2012-03-14 17:37:40 -07:00
Selim Gurun
146059898b Merge "Fix file path calculation for asset files." 2012-03-14 17:36:37 -07:00
Philip Milne
b269aaf860 Merge "Fix for bug 6170890." 2012-03-14 17:36:21 -07:00
Philip Milne
edd69518ff Fix for bug 6170890.
Also fix logic for consistency checking. Prior to this CL
GridLayout was causing Launcher to issue warnings to the logs
incorrectly.

Change-Id: I9d4017388e7c80c8bc5fa6cab97970835ff261fe
2012-03-14 17:27:26 -07:00
Romain Guy
c3da1b44e6 Merge "Optimize invalidate calls in lists." 2012-03-14 17:24:04 -07:00
Romain Guy
9d849a2f63 Optimize invalidate calls in lists.
AbsListView was doing too many invalidates during scrolls/flings.
Some of them were also covering too large an area of the screen.

Change-Id: I68fe5dda3657bddd673996e7cf4f3c3672c66cfc
2012-03-14 17:19:35 -07:00
Eino-Ville Talvala
bf4431bd93 Move CameraParameters.h to frameworks/native.
CameraParameters.h is indirectly required to implement the Camera
HAL. Move it to frameworks/native.

Bug: 6171735
Change-Id: I1bf4db228333be16fc7caa3c51280a9495293011
2012-03-14 17:14:19 -07:00
Marco Nelissen
0e9241dff5 Merge "Fix Xing seeking when TOC[0] == 0" 2012-03-14 16:58:13 -07:00
Craig Mautner
f44882ff1c Merge "Separate out animations from layout." 2012-03-14 16:55:58 -07:00
Glenn Kasten
27fa52701d Merge "Remove false dependencies" 2012-03-14 16:55:38 -07:00
Glenn Kasten
4e42c5f41f Remove dependency on audio_* location
Change-Id: I4bc66115fcb9ba22b057bd72db3f561dcb18a0d8
2012-03-14 16:44:34 -07:00
Marco Nelissen
b411579667 Fix Xing seeking when TOC[0] == 0
A file purchased from the Amazon mp3 store had two 0 entries at the
start of the TOC (presumably because there was a lot of silence at
the beginning, which compresses well), which made TOC based seeking
think the TOC was not valid.
b/6170518

Change-Id: Ie7135b4af06ebb925f63a374be780cf3a9404347
2012-03-14 16:42:09 -07:00
Insun Kang
41f3f716b0 Defines MediaPlayer APIs to support multiple audio/video/timedtext
tracks.

o Newly introduced APIs are (MediaPlayer):
  getTrackInfo() / addExternalSource() / enableTrack() / disableTrack().

o Timed text tracks are supported only, for now.

o TODOs:
 - Define the audio/video behavior for enableTrack and disableTrack.
 - Refactoring AwesomePlayer / TimedTextDriver so that all types of
   track index can be managed in the correct order and be ready for
   supporting audio/video tracks.
   (MediaExtractor and MediaSource for text file might be necessary.)

Change-Id: Idb85e1b3f2ed49a64f377d05472dd6663ce94e07
2012-03-15 08:36:52 +09:00
Glenn Kasten
81fe4fbd6b Merge "AudioFlinger playback thread CPU measurement in Hz" 2012-03-14 16:28:38 -07:00
Selim Gurun
658dcd87db Fix file path calculation for asset files.
Bug: 6019611
filter out query params and URI fragments from file path.

Change-Id: Ia5892490a5ffa89d82b52c2a5e6956a244566a4a
2012-03-14 16:24:31 -07:00
Russell Brenner
1f1bc8b12a Merge "Add notes about switching languages" 2012-03-14 16:15:42 -07:00
Craig Mautner
e32c307841 Separate out animations from layout.
(Dianne) pulled the animation steps out of the layout. Changes to
exposed layers cause repeated calls to layout code.

Combined animation steps into start and finish animation code.

Change-Id: I3602d1d6249d20987d102a54e3a67a7a39361b55
2012-03-14 16:09:28 -07:00
Glenn Kasten
f57e2bceb9 AudioFlinger playback thread CPU measurement in Hz
Log statistics on CPU usage in Hz in addition to wall clock time

Use CPU statistics for all playback threads, not just MIXER
(but they are disabled by default by a compile-time debug macro).

ThreadCpuUsage library:
 - Move statistics out of the library and leave that up to the caller
 - Add API to determine a CPU's frequency

Change-Id: Ia1011123146e641fcf210ef26e78ae2b4d3b64ad
2012-03-14 16:03:01 -07:00
Marco Nelissen
2af9dc5ecc Merge "Unhide MediaPlayer.setNextMediaPlayer" 2012-03-14 16:00:19 -07:00
Glenn Kasten
00b0a85e90 Remove false dependencies
Change-Id: I2a2976eb27b262bcba0c76ab37d822407d2337a7
2012-03-14 15:48:22 -07:00
Jason Sams
47324e940a Merge "Fix minor C++ api issues." 2012-03-14 15:43:27 -07:00
Eric Fischer
f97b46b272 Merge "Import translations. DO NOT MERGE" 2012-03-14 15:42:44 -07:00
Jason Sams
d1c8c1292c Fix minor C++ api issues.
Change-Id: I30e12938be5da52b2d952db57a51b4deb5e27239
2012-03-14 15:36:02 -07:00
Eric Laurent
5b9e0684fe Merge "audioflinger: more info in dumpsys" 2012-03-14 15:30:05 -07:00
Eric Laurent
0194a0d0dd audioflinger: more info in dumpsys
Added TID and io handle to AudioFlinger threads dump.

Change-Id: Ib1a856f3bad55c73e4c395b5e59d57435f4b9a4c
2012-03-14 15:04:54 -07:00
Omari Stephens
0c15f85824 Merge "Try to make error messages more useful and improve ANR handling" 2012-03-14 14:54:29 -07:00
Omari Stephens
8ac5959729 Merge "Avoid crashes in a single app from causing cascading test failures" 2012-03-14 14:53:21 -07:00
Marco Nelissen
467ec7eda8 Unhide MediaPlayer.setNextMediaPlayer
The Music apps are unbundled, so this needs to be unhidden for them to use it.

Change-Id: I24330a2d6cfa2f5fb5f9c282d28f5431b6165095
2012-03-14 14:49:02 -07:00
Teng-Hui Zhu
72b91b5e0c Merge "Live streaming video may not have the right size at prepared" 2012-03-14 14:47:23 -07:00
Glenn Kasten
58984b0738 Merge "Break circular dependency on media player service" 2012-03-14 13:57:03 -07:00
Glenn Kasten
9d41361634 Merge "Prepare frameworks/native/services/audioflinger" 2012-03-14 13:56:25 -07:00
Teng-Hui Zhu
5a080e2207 Live streaming video may not have the right size at prepared
The fix is add the OnVideoSizeChangedListener.
bug:5420327

Change-Id: I1e0b371b8b95b86a1c0903f4bdb1d8f38de793b7
2012-03-14 13:54:59 -07:00
Glenn Kasten
6940484150 Merge "Use correct syntax for #include <> """ 2012-03-14 13:54:21 -07:00
Dianne Hackborn
5108b1b3cf Merge "Add new "options" argument to all startActivity APIs." 2012-03-14 13:48:51 -07:00
Jake Hamby
f98f68d5ad Merge "Add support for CMAS warning notifications over CDMA." 2012-03-14 13:25:18 -07:00
Eric Fischer
e0b0a2c11d Import translations. DO NOT MERGE
Change-Id: I31003b11213e50fff8e42da9aaef3c60804d1301
2012-03-14 13:16:04 -07:00