ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
45,787 Commits 2 Branches 0 Tags 54 MiB
640579b736
Commit Graph

45787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tsu Chiang Chuang
0d910413a1 am 90cfe0f2: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1 
* commit '90cfe0f2f1e0e54c876157862abc0a588ef84b93':
 2012-02-19 07:46:04 -08:00
Al Sutton
579c2b4dc1 Xcode 4.3 compatibility checkin 
The update compiler in Xcode 4.3 (and 4.4) requires lookups into dependant
bases of class templates to be qualified. This checkin fixes the issues
raised by the compiler by implementing the this-> recommendation from
the llvm page at http://clang.llvm.org/compatibility.html#dep_lookup_bases

Signed-off-by: Al Sutton <al@funkyandroid.com>
 2012-02-19 08:31:19 +00:00
Mathias Agopian
0af7a60978 Merge "frameworks/base refactoring." 2012-02-17 19:26:39 -08:00
Mathias Agopian
a3a3881208 frameworks/base refactoring. 
step 2: move libutils headers to their new home: androidfw

Change-Id: I14624ba23db92a81f2cb929f104386e1fab293ef
 2012-02-17 19:01:26 -08:00
Jason Sams
5d98b5c2eb Merge "Work around VSync signal while screen is off." 2012-02-17 17:20:27 -08:00
Adam Powell
16616c021a Merge "Add transient state tracking to Views" 2012-02-17 17:15:04 -08:00
The Android Automerger
d661097a21 merge in ics-mr1-release history after reset to ics-mr1 2012-02-17 16:38:41 -08:00
Jeff Brown
11b79e1481 Merge "frameworks/base refactoring." 2012-02-17 16:28:20 -08:00
Tsu Chiang Chuang
46498e9f21 am a626f8d6: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1 
* commit 'a626f8d61bbcac2159a4f3c7b6e03c8dda482c78':
  fix NPE in race condition.
 2012-02-17 15:58:12 -08:00
Tsu Chiang Chuang
2c283a41cb am 2d559b53: Merge "fix NPE in race condition." into ics-mr1 
* commit '2d559b5311be1cd909e5a445afe75a840688b822':
  fix NPE in race condition.
 2012-02-17 15:55:56 -08:00
Tsu Chiang Chuang
f7285d1418 am 2d559b53: Merge "fix NPE in race condition." into ics-mr1 
* commit '2d559b5311be1cd909e5a445afe75a840688b822':
  fix NPE in race condition.
 2012-02-17 15:55:44 -08:00
Tsu Chiang Chuang
af139111ad Merge "fix NPE in race condition." into ics-mr1 2012-02-17 15:53:50 -08:00
Mathias Agopian
80c3918042 frameworks/base refactoring. 
First step. Move libui includes to their new home: androidfw.

Change-Id: Ic042b52fdba72f30edc3cc6339bf30b4c1b99662
 2012-02-17 15:36:10 -08:00
Adam Powell
2b985f6fcb am 8035db11: am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks 
* commit '8035db11ef3da209432b50dc178883ce4683336a':
 2012-02-17 15:27:46 -08:00
Adam Powell
22bf47f83c am fef000e3: am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks 
* commit 'fef000e3fa968a8dd165753f16c1c4cd38d59f33':
  Bug 6021294 - Contextual action bar animation tweaks
 2012-02-17 15:26:56 -08:00
Adam Powell
589760ba2c am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks 
* commit '482ae5f2388a07d60d7f3b54432120172af25eee':
  Bug 6021294 - Contextual action bar animation tweaks
 2012-02-17 15:25:29 -08:00
Adam Powell
1ae4c49c32 am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks 
* commit '482ae5f2388a07d60d7f3b54432120172af25eee':
  Bug 6021294 - Contextual action bar animation tweaks
 2012-02-17 15:25:18 -08:00
Romain Guy
571fbbcab3 Merge "Record possible clip rejects when recording display lists" 2012-02-17 15:18:14 -08:00
Siva Velusamy
082fbcfe94 Merge "gltrace: Trace thread time and wall clock time." 2012-02-17 15:05:36 -08:00
Iliyan Malchev
99942550c0 Merge "libs/utils: replace malloc() + memset() to zero with calloc()" 2012-02-17 14:51:32 -08:00
Mike Lockwood
35670135a2 Merge "Revert "Revert "The com.android.athome api classes are moving android.support.place.""" 2012-02-17 14:33:27 -08:00
Iliyan Malchev
4aec1681db Merge "bluetooth: replace malloc() + memset() to zero with calloc()" 2012-02-17 14:28:38 -08:00
Iliyan Malchev
6032a77682 libs/utils: replace malloc() + memset() to zero with calloc() 
Change-Id: I8bdf4360147e51e35c162856c9a859aed6acac34
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2012-02-17 14:27:13 -08:00
Jean-Baptiste Queru
7ad03cddb9 am 1d4c4d42: am 44c1f012: Merge "Return error code when composing PDU fails" 
* commit '1d4c4d42edb92a3dd82238eafef23a0bfa0267d3':
  Return error code when composing PDU fails
 2012-02-17 13:22:56 -08:00
Jean-Baptiste Queru
21b6f35bf7 am 99ccf407: am c2461eb3: Merge "Add support for bmp and wav content types in MMS" 
* commit '99ccf407bf7fc96eab9e1f747e0fa93391330438':
  Add support for bmp and wav content types in MMS
 2012-02-17 13:22:54 -08:00
Jean-Baptiste Queru
9bae0ddd16 am 44c1f012: Merge "Return error code when composing PDU fails" 
* commit '44c1f012c4ffa75853a068963b212ee1c965b6ea':
  Return error code when composing PDU fails
 2012-02-17 13:18:34 -08:00
Jean-Baptiste Queru
77ffe4aa69 am c2461eb3: Merge "Add support for bmp and wav content types in MMS" 
* commit 'c2461eb32ebad522a946e9fef9c31e886d98124a':
  Add support for bmp and wav content types in MMS
 2012-02-17 13:18:31 -08:00
Romain Guy
96c3876876 Merge "Remove unused private APIs" 2012-02-17 13:09:19 -08:00
Eric Fischer
a4fb1682ed Merge "Import translations." 2012-02-17 12:18:44 -08:00
Jason Sams
fe3480bb73 Merge "Update prototype remote fifo. Tested primary connection using only fifo data transport." 2012-02-17 12:05:13 -08:00
Jason Sams
b981f99a79 Merge "Rename three header files to free namespace for api." 2012-02-17 12:04:20 -08:00
Jean-Baptiste Queru
125c4b9a95 Merge "Return error code when composing PDU fails" 2012-02-17 11:36:52 -08:00
Siva Velusamy
05df4504e5 gltrace: Trace thread time and wall clock time. 
For each gl function, trace both the thread and wall clock
times.

Change-Id: I32b6caa67fa50bf915dab89b3c5021ee82e28d55
 2012-02-17 11:09:47 -08:00
Jean-Baptiste Queru
651fdee192 Merge "Add support for bmp and wav content types in MMS" 2012-02-17 11:03:35 -08:00
The Android Open Source Project
05dddc0671 am f5f5d61c: Reconcile with ics-mr1-release 
* commit 'f5f5d61c611b6f2c699ba472972e0b5c33c82402':
 2012-02-17 10:46:48 -08:00
Glenn Kasten
2752181174 Merge "Remove bit fields to improve performance" 2012-02-17 10:45:02 -08:00
Jeff Brown
ade5440ce8 Merge "Ignore broken input channel when finishing input event." 2012-02-17 10:30:50 -08:00
Jean-Baptiste Queru
0306188977 am 8a33803d: am a1ee18f1: Merge "Increase PDU parts buffer size for performance reasons" 
* commit '8a33803df5477bb9bd20bfae8c7a7d0833f6d2a9':
  Increase PDU parts buffer size for performance reasons
 2012-02-17 10:18:49 -08:00
Jean-Baptiste Queru
61cb633f43 am a1ee18f1: Merge "Increase PDU parts buffer size for performance reasons" 
* commit 'a1ee18f1413471813f36a1d05927f5513c8931f5':
  Increase PDU parts buffer size for performance reasons
 2012-02-17 10:13:05 -08:00
Philip Milne
939000dfd0 Merge "Fix remaining issue with bug #5904777" 2012-02-17 10:06:47 -08:00
Mike Lockwood
2147ab9520 Merge "Revert "The com.android.athome api classes are moving android.support.place."" 2012-02-17 09:53:30 -08:00
Jean-Baptiste Queru
3429dad456 Merge "Increase PDU parts buffer size for performance reasons" 2012-02-17 09:53:29 -08:00
Mike Lockwood
2adfb82375 Merge "New clock sync control loop." 2012-02-17 09:47:47 -08:00
Glenn Kasten
4ede6e268a Merge "Simplify code" 2012-02-17 09:40:43 -08:00
Mike Lockwood
aebc7b8cbd Merge "Put a bandaid on a segfault in timed audio track handling." 2012-02-17 09:20:43 -08:00
Mike Lockwood
1ca081efdc Merge "The com.android.athome api classes are moving android.support.place." 2012-02-17 09:20:12 -08:00
Glenn Kasten
7a091616c9 Merge "Fixed possible heap corruption in EffectDesc" 2012-02-17 09:19:49 -08:00
The Android Open Source Project
c4a6e6758d Reconcile with ics-mr1-release 
Change-Id: I04e83e00da70672ba81716c43919c489e77b14c6
 2012-02-17 09:02:50 -08:00
The Android Open Source Project
a00c2411ab am c30fdda0: Reconcile with ics-mr1-release 
* commit 'c30fdda052e82ca7b014b9817945e465cca78c75':
 2012-02-17 08:13:35 -08:00
The Android Open Source Project
7442aa2c4c Reconcile with ics-mr1-release 
Change-Id: I0126d92680a2624881870d7c835b3abd02cd6bab
 2012-02-17 08:09:34 -08:00