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

68340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
12aba767c7 remove dummy libsurfaceflinger_client 
Change-Id: Idd67a3f936deae7ba5d1cd5000d191fad271381e
 2012-02-27 13:03:03 -08:00
Vikram Aggarwal
4a88964d65 Merge "affect -> effect and incorrect possessive" 2012-02-27 12:36:53 -08:00
Siva Velusamy
89dd68f8d2 Merge "gltrace: Make code 64-bit safe." 2012-02-27 12:31:01 -08:00
Jean-Baptiste Queru
9e3d957599 Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" 2012-02-27 12:14:41 -08:00
Jean-Baptiste Queru
354ac772ec Merge "stagefright amrwb: Make local const arrays static" 2012-02-27 12:14:02 -08:00
Jean-Baptiste Queru
695cfe1e1e Merge "stagefright amrwb: Change a C++ style cast into a C style cast" 2012-02-27 12:13:27 -08:00
Siva Velusamy
d4edba0fe9 gltrace: Make code 64-bit safe. 
Currently, the trace API passes the pointers that need to be
patched up via 32 bit integers. Such code will not be 64 bit safe.
This patch sends all pointers in a separate array of pointers
for the fixup calls to read from.

Change-Id: If975333f11a6f6f9a74fba57de328affaed452a5
 2012-02-27 12:08:47 -08:00
Daniel Lam
05221052c5 Revert "Removed dependecies between BufferQueue and SurfaceTexture" 
This reverts commit a631399f71dbc7659d2f241968f85d337726ae61
 2012-02-27 11:32:06 -08:00
Robert Ly
35ae6e2a84 am 718af2f9: am 55a1c40f: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1 
* commit '718af2f93bbc0eda5a72e736e14b3a08d52799ed':
 2012-02-27 11:30:39 -08:00
Robert Ly
718af2f93b am 55a1c40f: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1 
* commit '55a1c40fa0f127b442a2e7f0677a3181e28b6ec2':
 2012-02-27 11:28:07 -08:00
Jean-Baptiste Queru
f7f1280e0c Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 
* changes:
  stagefright amrnb: Remove extern from table definitions
  stagefright amrnb: Add includes for prototype declarations of tables
  stagefright amrnb: Add missing const qualifier to table declarations in headers
 2012-02-27 11:16:23 -08:00
Vikram Aggarwal
04bf50c352 affect -> effect and incorrect possessive 
Change-Id: I75bcbdf35676b17a6e16b47710dddcfc99032212
 2012-02-27 11:16:14 -08:00
Jean-Baptiste Queru
1a864db772 Merge "stagefright aacenc: Simplify the definition of __inline" 2012-02-27 11:11:57 -08:00
Jean-Baptiste Queru
77576ff487 Merge "stagefright amrwbenc: Remove a useless check" 2012-02-27 11:11:18 -08:00
Jean-Baptiste Queru
be9a705586 Merge "stagefright aacenc: Remove a stray semicolon" 2012-02-27 11:09:59 -08:00
Jean-Baptiste Queru
fe5f5d7728 Merge "stagefright amrwb: Make a global const array static" 2012-02-27 11:08:09 -08:00
Jean-Baptiste Queru
94ee1bf232 Merge "stagefright amrwbenc: Change keyword ordering" 2012-02-27 11:06:25 -08:00
Jean-Baptiste Queru
5aff259c61 Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer" 2012-02-27 10:58:51 -08:00
Robert Ly
4709a11b5d am 9dc8ea87: am c76ca242: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1 
* commit '9dc8ea87b5016ca838373ff4996e9c92247aa224':
  docs: fix bug 5990526
 2012-02-27 08:49:04 -08:00
Robert Ly
9dc8ea87b5 am c76ca242: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1 
* commit 'c76ca242ce2bd26c97c78ddf6842429850f541d9':
  docs: fix bug 5990526
 2012-02-27 08:46:00 -08:00
Robert Ly
c76ca242ce am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1 
* commit '85cb9dece27c7ebc29b48bd8e5dd3457fa3b6a87':
  docs: fix bug 5990526
 2012-02-27 08:42:48 -08:00
Robert Ly
55a1c40fa0 am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1 
* commit '85cb9dece27c7ebc29b48bd8e5dd3457fa3b6a87':
  docs: fix bug 5990526
 2012-02-27 08:42:19 -08:00
Robert Ly
85cb9dece2 Merge "docs: fix bug 5990526" into ics-mr1 2012-02-27 08:40:54 -08:00
Xavier Ducrohet
9c821d71e9 am 7a879da1: am df154866: am 44e63a21: Support rendering layout that use the new res-auto namespace. 
* commit '7a879da1571027ef812b1322754f9c1daa378de1':
 2012-02-27 07:51:10 -08:00
Xavier Ducrohet
aeb17f17ff am 77fdcbff: am f038868d: am 44e63a21: Support rendering layout that use the new res-auto namespace. 
* commit '77fdcbff8b458dd3430b38e60aee1a28ca92a738':
  Support rendering layout that use the new res-auto namespace.
 2012-02-27 07:51:05 -08:00
Siva Velusamy
0a66900ee5 Merge "gltrace: attach buffer data sent with glBufferData" 2012-02-27 07:41:38 -08:00
Glenn Kasten
40ba9cddea Merge "Make threadLoop() logs identical" 2012-02-27 07:24:46 -08:00
Glenn Kasten
db316b212f Merge "Move declaration of mixerStatus to inner block" 2012-02-27 07:21:00 -08:00
Ben Murdoch
1d7b856a97 Merge "Fix looping HTML5 Audio." 2012-02-27 02:17:23 -08:00
Jamie Gennis
c108613fb8 Merge "Removed dependecies between BufferQueue and SurfaceTexture" 2012-02-26 17:06:42 -08:00
Jamie Gennis
f217df6819 libutils: add a system-wide tracing utility 
This change adds some utility functionality for doing userland tracing
into the kernel trace log.

Change-Id: Id0a8cee9ea515b1d8765afd1cecf472a88b4b9e8
 2012-02-26 16:06:53 -08:00
Eric Fischer
7fbedadb62 Merge "Import translations. DO NOT MERGE" 2012-02-25 19:34:19 -08:00
John Wang
0593c68a98 Prevent dial() return null in a racing condition. 
The racing condition happens between dial() returns and
the first GET_CURRENT_CALLS query gets handled.

If GET_CURRENT_CALLS gets handled before dial() finishs, the pendingMO can be set
to null in handlePollCalls() so that dial() will return null. This null connection causes
error in PhoneUtils.placeCall().

The Synchronized dial() and handlePollCalls() Methods will make sure the
dial() returns before the first GET_CURRENT_CALLS gets handled.

bug:6028290
Change-Id: I41b024760acb7dd13b342866180dffe3fdbe1c03
 2012-02-24 22:26:34 -08:00
Mathias Agopian
f69d204d2d Merge "attempt to fix IMSFramework crash" 2012-02-24 19:58:05 -08:00
Adam Powell
d020ebff2c Merge "Fix bug 6065890 - Correct callback sequence for action bar tab switching" 2012-02-24 19:50:11 -08:00
Xavier Ducrohet
7a879da157 am df154866: am 44e63a21: Support rendering layout that use the new res-auto namespace. 
* commit 'df154866fbad10faf8f9bceb8843aca1e2a69984':
 2012-02-24 19:36:34 -08:00
Xavier Ducrohet
77fdcbff8b am f038868d: am 44e63a21: Support rendering layout that use the new res-auto namespace. 
* commit 'f038868d74af534effceaa8f1d932f9576f4f647':
  Support rendering layout that use the new res-auto namespace.
 2012-02-24 19:35:25 -08:00
Xavier Ducrohet
f038868d74 am 44e63a21: Support rendering layout that use the new res-auto namespace. 
* commit '44e63a218cf8fcab9b4418246a512bd0b0c9157b':
  Support rendering layout that use the new res-auto namespace.
 2012-02-24 19:32:47 -08:00
Xavier Ducrohet
df154866fb am 44e63a21: Support rendering layout that use the new res-auto namespace. 
* commit '44e63a218cf8fcab9b4418246a512bd0b0c9157b':
  Support rendering layout that use the new res-auto namespace.
 2012-02-24 19:32:32 -08:00
Mathias Agopian
d13f9aa8b1 attempt to fix IMSFramework crash 
Change-Id: Iad6dd85afe8f37c1e443c116162d75f116c24316
 2012-02-24 19:32:03 -08:00
Xavier Ducrohet
44e63a218c Support rendering layout that use the new res-auto namespace. 
Change-Id: I9b89c965dc8c9458e74c15ab8ff765e16e1b32c2
 2012-02-24 19:29:31 -08:00
Adam Powell
c4e57e23f9 Fix bug 6065890 - Correct callback sequence for action bar tab switching 
Keep the callback behavior consistent when action bar tabs collapse
into a spinner.

Change-Id: Ia82e55d816a92b7ec746e1d25486bc9d2c0778f4
 2012-02-24 19:25:43 -08:00
Daniel Sandler
13ff5331f9 Merge "Fix fullScreenIntents." 2012-02-24 19:10:01 -08:00
Mathias Agopian
018549e4bf Merge "remove dependency on android_native{s_priv|buffer}.h" 2012-02-24 19:08:12 -08:00
Daniel Sandler
fc6fda3950 Fix fullScreenIntents. 
The intruder alert stuff was getting activated, but it's not
really ready yet.

Bug: 6070420
Change-Id: If65165e96bddf1e5e4c89ed26131e45639d5cf2d
 2012-02-24 22:05:27 -05:00
Dianne Hackborn
5265466e8a Merge "New development permissions." 2012-02-24 18:40:37 -08:00
Mathias Agopian
af01feafc3 remove dependency on android_native{s_priv|buffer}.h 
Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89
 2012-02-24 18:26:01 -08:00
Romain Guy
2abb138152 Merge "More infrastructure for Canvas.drawTextOnPath" 2012-02-24 18:01:47 -08:00
Romain Guy
778f67f7c0 Merge "Add hooks to implement Canvas.drawTextOnPath() in GL" 2012-02-24 18:01:22 -08:00
Romain Guy
03d58520c3 More infrastructure for Canvas.drawTextOnPath 
Change-Id: Iff42b24e342650d06fa4e2fa9db6c28da820ff01
 2012-02-24 17:54:07 -08:00