ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
46,263 Commits 2 Branches 0 Tags 54 MiB
0818b0921e
Commit Graph

46263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
174e348039 am d559bc79: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'd559bc79d546f1b448cc43851de5f43babc81795':
 2012-03-02 09:10:22 -08:00
Robert Ly
34f58c8b8a am 67a15457: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit '67a15457d184f01fffe162a0983d0b507cb7b358':
  docs: fixing bug 5942573
 2012-03-02 09:09:30 -08:00
Robert Ly
b88b34907b am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'e5e11fd666d242b099466017c6d9bd23e6d2896d':
  docs: fixing bug 5942573
 2012-03-02 09:06:44 -08:00
Robert Ly
4b8c531487 am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'e5e11fd666d242b099466017c6d9bd23e6d2896d':
  docs: fixing bug 5942573
 2012-03-02 09:06:44 -08:00
Robert Ly
81c173f348 Merge "docs: fixing bug 5942573" into ics-mr1 2012-03-02 09:04:16 -08:00
George Mount
acf2581ff6 Merge "Quick fix for Monkey NPE." 2012-03-02 08:43:43 -08:00
Dianne Hackborn
f737be5495 am d4202c9d: am 921e8303: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit 'd4202c9d138459a60fde708ecda995f3b599d252':
 2012-03-02 08:42:22 -08:00
Dianne Hackborn
35fbc7c0cc am 5d87d51f: am f65951bf: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit '5d87d51fab7e17793413c9095028963117e276b8':
  Make ResolverActivity update dynamically.
 2012-03-02 08:39:39 -08:00
Dianne Hackborn
57d94bc9ae am 921e8303: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit '921e83039d266b6d288fd5e09160d878eccb9e23':
 2012-03-02 08:37:48 -08:00
Dianne Hackborn
e8f6cdb6c1 am f65951bf: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit 'f65951bf5db7a248651cbfa89886d773f95c3e03':
  Make ResolverActivity update dynamically.
 2012-03-02 08:36:05 -08:00
Dianne Hackborn
1ba5d3119f am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit '0dd9ec144b0da8df9d8900d78c8177e761de458d':
  Make ResolverActivity update dynamically.
 2012-03-02 08:33:22 -08:00
Dianne Hackborn
4afecd7a91 am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit '0dd9ec144b0da8df9d8900d78c8177e761de458d':
  Make ResolverActivity update dynamically.
 2012-03-02 08:33:21 -08:00
Dianne Hackborn
b534fb5266 Merge "Make ResolverActivity update dynamically." into ics-mr1 2012-03-02 08:30:36 -08:00
Adam Powell
0be3fa3b27 am d9760a81: am 25517fdc: am 637c50db: am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" 
* commit 'd9760a813e99670c5bdb05c95ae3bafb58abf897':
  Fix dividers for LinearLayout (TabWidget)
 2012-03-01 23:57:10 -08:00
Adam Powell
940254324f am 25517fdc: am 637c50db: am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" 
* commit '25517fdc53018ef676a1d340e2d5cbd780e5dc8b':
  Fix dividers for LinearLayout (TabWidget)
 2012-03-01 22:52:39 -08:00
Adam Powell
12c1f3f2c7 am 637c50db: am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" 
* commit '637c50db476d9a6cec13551920f7c163fef02ab8':
  Fix dividers for LinearLayout (TabWidget)
 2012-03-01 22:49:46 -08:00
Adam Powell
31e1de1d35 am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" 
* commit 'c7e5a2fe3042014f78667228a92e41d0a19547fd':
  Fix dividers for LinearLayout (TabWidget)
 2012-03-01 22:46:26 -08:00
Mathias Agopian
546ed2d7d9 Add ATRACEs for Buffer indices 
Change-Id: I44d7a9a9bf03f418cab2a4854583aac9e533daee
 2012-03-01 22:20:24 -08:00
Mathias Agopian
06b573e4f9 Merge "add more tracing for buffer allocation" 2012-03-01 21:22:35 -08:00
Mathias Agopian
cba1a9ab12 Merge "add more ATRACE" 2012-03-01 21:22:25 -08:00
Mathias Agopian
841cde5554 add more ATRACE 
Change-Id: I6cc5759fb0a05427680488fd12ae797e77644f3d
 2012-03-01 20:16:39 -08:00
Craig Mautner
b52cc9c516 Merge "Separate animation steps into start, step and finish phases. Fixes bug 6089126." 2012-03-01 19:29:46 -08:00
Dianne Hackborn
f1cb384fad Merge "Whoops forgot this change." 2012-03-01 19:21:40 -08:00
Dianne Hackborn
9d2521957d Merge "Fix issue where pm would clear preferred apps when updating an app." 2012-03-01 19:21:22 -08:00
Jim Miller
0d080ecdb9 Merge "Fix 6028595: Fix reboot loop in AccountUnlock due to null callback" 2012-03-01 19:02:19 -08:00
Fabrice Di Meglio
7486a1162e Merge "Improve RTL APIs" 2012-03-01 17:44:19 -08:00
Siva Velusamy
50129e4ae2 gltrace: Send vertex attribute data after glDraw() call. 
This patch enables tracing of vertex attribute data that
is specified using glVertexAttribPointer().

At the time the glVertexAttribPointer() call is made, we
only receive a pointer in client space, without any indication
of the size (# of attributes). This size is known only at
the time of the glDraw() call.

This patch generates a new message glVertexAttribPointerData()
when a draw call is issued that contains the vertex attribute
data.

A glDrawArrays() call directly gives the size of data to copy.
A glDrawElements() call gives the indices to copy. In such a
case, all data between the min & max indices drawn are copied
and sent to the host. To support glDrawElements() with an
element array buffer, this patch also adds state that maintains
a copy of all element array buffers.

Change-Id: I434da794a0aa9ada8e7474e219ffb1d79b183ecf
 2012-03-01 17:41:53 -08:00
Romain Guy
489380f470 Merge "Remove stray log" 2012-03-01 17:35:25 -08:00
Tsu Chiang Chuang
00c8249524 am 8f0c03b7: am 673a66e3: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '8f0c03b7833c719c29198be0e4fecbdfb4013e64':
 2012-03-01 17:15:32 -08:00
Tsu Chiang Chuang
2beecf150d am 6053b195: am bb69bde5: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '6053b195bcd49676b46b2257f6e1da04d0b4d9a5':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:12:55 -08:00
Tsu Chiang Chuang
4eb0a7423b am 673a66e3: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '673a66e357f49f939cf8e7f603ff14b8474c9032':
 2012-03-01 17:11:22 -08:00
Tsu Chiang Chuang
9b070feff2 am bb69bde5: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit 'bb69bde593bc0ba58c744b19c43619d4eb0866b7':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:10:23 -08:00
Tsu Chiang Chuang
0f88bfc2d8 am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '3e70127021f5d5940edfdefd7e33fd65d4ec0449':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:07:43 -08:00
Tsu Chiang Chuang
d3cb1c2f89 am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '3e70127021f5d5940edfdefd7e33fd65d4ec0449':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:07:25 -08:00
Tsu Chiang Chuang
b1b58c7e01 Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 2012-03-01 17:05:43 -08:00
Wink Saville
011d5e216b Merge "Telephony: Remove SimCard and RuimCard" 2012-03-01 17:03:47 -08:00
Robert Ly
c1c13af09a am 37f9360a: am 3c78e101: am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit '37f9360a21985b2627d7069160d2950edf31c021':
 2012-03-01 16:47:06 -08:00
Robert Ly
3d5474e8db am ca7d7541: am d70eaff4: am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit 'ca7d7541c4cad188eb643113e3c3e91e63d21a5e':
  fix bug 5942522
 2012-03-01 16:47:04 -08:00
Robert Ly
e9658e26f0 am a2310712: am 9d36dcc0: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit 'a231071249f03f7b10e1991c9988476d2b15a9f7':
 2012-03-01 16:46:58 -08:00
Robert Ly
1928ae8c7a am b4afb9a8: am 8125b0b4: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit 'b4afb9a89e1a2131ac273f0452fa89b83090b05a':
  docs: fix bug 5878445
 2012-03-01 16:46:55 -08:00
The Android Open Source Project
1b25fd9ea2 am efa49439: am 4f306bec: Reconcile with ics-mr1-release 
* commit 'efa4943952f81a5cb5a5d410cc4b53ca665d7065':
 2012-03-01 16:46:44 -08:00
Jeff Brown
cf274215e1 Merge "Shouldn't catch Throwable in AsyncTask." 2012-03-01 16:43:41 -08:00
Irfan Sheriff
ee48a84775 Merge "Fix WifiManager async API" 2012-03-01 16:26:52 -08:00
Adam Powell
1ef7b6ead9 Merge "Fix dividers for LinearLayout (TabWidget)" 2012-03-01 16:26:04 -08:00
Fabrice Di Meglio
e23b4521ee Merge "Make layoutDirection API public" 2012-03-01 16:23:29 -08:00
Brian Carlstrom
9011600b21 Merge "Remove obsolete KeyChain references to USE_CREDENTIALS (2 of 2)" 2012-03-01 16:22:13 -08:00
Teng-Hui Zhu
715f6e8a65 Merge "Allow webview to delete GL resource in a valid EGL context" 2012-03-01 16:04:18 -08:00
The Android Open Source Project
4d811ec616 am 956abc30: am f8e58c8b: Reconcile with ics-mr1-release 
* commit '956abc304f6e03f20f4342988cbba9ac1c27a03b':
 2012-03-01 15:51:34 -08:00
Andreas Huber
66b4557b7e Merge "Remove hacks that worked around issues in OMX components several releases back." 2012-03-01 15:46:19 -08:00
Android Git Automerger
0921733b1a am 55fbbce4: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 
* commit '55fbbce495723a5b17f1b4684d0f9826c75caa97':
 2012-03-01 15:35:49 -08:00