ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
17,483 Commits 2 Branches 0 Tags 54 MiB
c220c3051e
Commit Graph

17483 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
c220c3051e am 3b335078: ignore from froyo-plus-aosp 
Merge commit '3b335078e8a6fe3e2045ad081785f139d5991786'

* commit '3b335078e8a6fe3e2045ad081785f139d5991786':
  Fix that InputDeviceReaderThread that got killed during startup
 2010-06-25 14:21:44 -07:00
James Dong
c640d420ed am d115304c: am 5a905ceb: Merge "Track maximum amplitude and fix getMaxAmplitude()" into gingerbread 
Merge commit 'd115304c0900713d6f8d4033722d9c647f40ceae'

* commit 'd115304c0900713d6f8d4033722d9c647f40ceae':
  Track maximum amplitude and fix getMaxAmplitude()
 2010-06-25 14:21:04 -07:00
Romain Guy
bb33b9b720 Merge "Implement quickReject() and drawRect()." 2010-06-25 13:43:21 -07:00
Jason Sams
d6b9dc4210 Merge "Add support for non-VBO drawing in Meshes." 2010-06-25 12:46:35 -07:00
Vasu Nori
558e6a953d Merge "remove some not-so-useful-logging" 2010-06-25 11:16:28 -07:00
The Android Open Source Project
aa25569069 ignore from froyo-plus-aosp 
Change-Id: I8144bf5c270b95c06252e7195b7cc2bc91452849
 2010-06-25 10:51:16 -07:00
James Dong
f750cd89de am 5a905ceb: Merge "Track maximum amplitude and fix getMaxAmplitude()" into gingerbread 
Merge commit '5a905ceb063bd31170d3d869efcd051cbd8e4e13' into gingerbread-plus-aosp

* commit '5a905ceb063bd31170d3d869efcd051cbd8e4e13':
  Track maximum amplitude and fix getMaxAmplitude()
 2010-06-25 09:47:51 -07:00
James Dong
0284cd2386 Merge "Track maximum amplitude and fix getMaxAmplitude()" into gingerbread 2010-06-25 09:43:14 -07:00
Alex Sakhartchouk
2f08ad6cb8 Merge "Adding freetype font rendering to renderscript." 2010-06-25 09:24:19 -07:00
Jeff Hamilton
9acd654581 Revert "am 256fc043: am 081bc5c4: fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger" 
This reverts commit e02dec8c4cbab17d09983af1328308b8aa61ef85, reversing
changes made to 6d7a052fb04b251c517d0a9049b8d5d7408ce8c0.

Bug: 2798567
 2010-06-25 10:48:08 -05:00
Mathias Agopian
7223bde667 am 256fc043: am 081bc5c4: fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger 
Merge commit '256fc04394431cbd332e56747fdbfda4cb4c2e25'

* commit '256fc04394431cbd332e56747fdbfda4cb4c2e25':
  fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
 2010-06-25 08:30:06 -07:00
Daniel Sandler
f343409174 am b9353372: am 8896783d: Updated StatusBar test app for new notifications API. 
Merge commit 'b9353372f67dcb18bccb26165758a47cfe3197de'

* commit 'b9353372f67dcb18bccb26165758a47cfe3197de':
  Updated StatusBar test app for new notifications API.
 2010-06-25 08:30:02 -07:00
Daniel Sandler
3c10135933 am bc4bc709: am 87160757: Basic handling of Notifications with fullScreenIntent. 
Merge commit 'bc4bc709a819801a23aa604896ae2457ae710bec'

* commit 'bc4bc709a819801a23aa604896ae2457ae710bec':
  Basic handling of Notifications with fullScreenIntent.
 2010-06-25 08:29:56 -07:00
Derek Sollenberger
976118b24a Merge "fix NullPointerException caused by inflating XML Webview that is defined to be non-visible." 2010-06-25 04:28:50 -07:00
Steve Block
d78ca15ec3 Merge "Fixes a few minor problems with AAPT" 2010-06-25 03:03:59 -07:00
Mathias Agopian
01420d4d47 am 081bc5c4: fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger 
Merge commit '081bc5c47d8a980e6eafa70ddafcd89981586391' into gingerbread-plus-aosp

* commit '081bc5c47d8a980e6eafa70ddafcd89981586391':
  fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
 2010-06-24 21:36:37 -07:00
Mathias Agopian
01e4483b29 fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger 
Make sure to not use GL_TEXTURE_EXTERNAL when it's not supported
by the GL. The error was harmless, but annoying.

Change-Id: I571a9a9b05d35da51420950a6a6e95629067efd0
 2010-06-24 21:28:59 -07:00
Romain Guy
502e4aadf8 Merge "Add colored rectangles implementation in OpenGLRenderer." 2010-06-24 19:32:44 -07:00
Daniel Sandler
ddcc9cdce8 am 8896783d: Updated StatusBar test app for new notifications API. 
Merge commit '8896783dc1d31c5274b277c364da0ffe7cc27cca' into gingerbread-plus-aosp

* commit '8896783dc1d31c5274b277c364da0ffe7cc27cca':
  Updated StatusBar test app for new notifications API.
 2010-06-24 19:13:25 -07:00
Daniel Sandler
86514f07ca am 87160757: Basic handling of Notifications with fullScreenIntent. 
Merge commit '87160757e827e8e158d233de09d70e7128184729' into gingerbread-plus-aosp

* commit '87160757e827e8e158d233de09d70e7128184729':
  Basic handling of Notifications with fullScreenIntent.
 2010-06-24 19:13:22 -07:00
Scott Main
40d51b252b am 8ab65289: am 7dacda11: am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo 
Merge commit '8ab652896394526d8793973067b228eca34201a7'

* commit '8ab652896394526d8793973067b228eca34201a7':
  docs: Remove the TOS from download flow and remove TOS entirely because
 2010-06-24 18:18:28 -07:00
Scott Main
82267d33d4 am 7dacda11: am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo 
Merge commit '7dacda1142379df1f1f9854c24e452acdea98436' into gingerbread-plus-aosp

* commit '7dacda1142379df1f1f9854c24e452acdea98436':
  docs: Remove the TOS from download flow and remove TOS entirely because
 2010-06-24 18:16:31 -07:00
Scott Main
9a4a1d7104 am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo 
Merge commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into gingerbread

* commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
  docs: Remove the TOS from download flow and remove TOS entirely because
 2010-06-24 18:12:49 -07:00
Scott Main
29d8e66ce0 Merge "docs: Remove the TOS from download flow and remove TOS entirely because it's no longer relevant to the SDK download package" into froyo 2010-06-24 18:10:41 -07:00
Jason Sams
467168d990 Merge "Fix return values for rsClamp." 2010-06-24 17:57:18 -07:00
Joe Onorato
b5a3decb70 am 0bf5cce9: am 0a0edcca: Merge "Fix the notification vibration setting and add a test app that lets you recover from the busted state." into gingerbread 
Merge commit '0bf5cce9ee5f7db9932a8ba27e86836a9d96677c'

* commit '0bf5cce9ee5f7db9932a8ba27e86836a9d96677c':
  Fix the notification vibration setting and add a test app that lets you recover from the busted
 2010-06-24 17:55:59 -07:00
Joe Onorato
824a9be4e9 am 0a0edcca: Merge "Fix the notification vibration setting and add a test app that lets you recover from the busted state." into gingerbread 
Merge commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9' into gingerbread-plus-aosp

* commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9':
  Fix the notification vibration setting and add a test app that lets you recover from the busted
 2010-06-24 17:53:28 -07:00
Joe Onorato
b293194aaf Merge "Fix the notification vibration setting and add a test app that lets you recover from the busted state." into gingerbread 2010-06-24 17:51:22 -07:00
Dianne Hackborn
414a20019a am ea8eafad: am 2529a453: Merge "Make bad notifications crash their application." into gingerbread 
Merge commit 'ea8eafad4f5438ec1291d45376959a996d36e15e'

* commit 'ea8eafad4f5438ec1291d45376959a996d36e15e':
  Make bad notifications crash their application.
 2010-06-24 17:33:14 -07:00
Dianne Hackborn
3ac5c060c0 am 2529a453: Merge "Make bad notifications crash their application." into gingerbread 
Merge commit '2529a45339b7e02d9d2b813358bcecd144a971ea' into gingerbread-plus-aosp

* commit '2529a45339b7e02d9d2b813358bcecd144a971ea':
  Make bad notifications crash their application.
 2010-06-24 17:30:42 -07:00
Dianne Hackborn
d5715e00b0 Merge "Make bad notifications crash their application." into gingerbread 2010-06-24 17:28:13 -07:00
Dianne Hackborn
2f38caec1e am cac3126c: am 5340bffd: am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo 
Merge commit 'cac3126c6109854640266c4807e5aa8e6a87142f'

* commit 'cac3126c6109854640266c4807e5aa8e6a87142f':
  Properly note the current active restore set's token
 2010-06-24 17:16:37 -07:00
Dianne Hackborn
6e9bf4aba7 resolved conflicts for merge of 2eb12a47 to master 
Change-Id: I79eb9d9f083e51ec1b99145d81632683669e7a99
 2010-06-24 16:29:54 -07:00
Dianne Hackborn
d4002eef0f am 5340bffd: am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo 
Merge commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961' into gingerbread-plus-aosp

* commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961':
  Properly note the current active restore set's token
 2010-06-24 16:04:07 -07:00
Dianne Hackborn
d965b79268 am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo 
Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into gingerbread

* commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
  Properly note the current active restore set's token
 2010-06-24 16:01:39 -07:00
Dianne Hackborn
2f90b21533 Merge "Properly note the current active restore set's token" into froyo 2010-06-24 16:00:06 -07:00
Dianne Hackborn
f5f049c70d am 01e4cfc4: Some ActivityThread/ActivityManager cleanup. 
Merge commit '01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301' into gingerbread-plus-aosp

* commit '01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301':
  Some ActivityThread/ActivityManager cleanup.
 2010-06-24 15:23:59 -07:00
Jason Sams
038cbce216 Merge "Add matrix ops to RSH headers." 2010-06-24 14:51:28 -07:00
Andreas Huber
2c36aafba0 am 95d26de9: am 7b5b27ad: Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread 
Merge commit '95d26de9e048ef0342e3aed15a4d5d5c8a6e8493'

* commit '95d26de9e048ef0342e3aed15a4d5d5c8a6e8493':
  Properly identify malformed (too short) chunks in mpeg4 files.
 2010-06-24 13:18:12 -07:00
Andreas Huber
0c7fb72274 am 7b5b27ad: Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread 
Merge commit '7b5b27ada12d3680dec20274fa655fd7f73f839e' into gingerbread-plus-aosp

* commit '7b5b27ada12d3680dec20274fa655fd7f73f839e':
  Properly identify malformed (too short) chunks in mpeg4 files.
 2010-06-24 13:16:47 -07:00
Andreas Huber
e0bdac3197 Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread 2010-06-24 13:14:38 -07:00
Dianne Hackborn
f8a84f223d am 82677b95: am e57c3a88: Merge "Add APIs for finding heavy-weight apps." into gingerbread 
Merge commit '82677b9585968806800abff65c5b1529f509a313'

* commit '82677b9585968806800abff65c5b1529f509a313':
  Add APIs for finding heavy-weight apps.
 2010-06-24 12:46:31 -07:00
Dianne Hackborn
0cb77eb8ab am e57c3a88: Merge "Add APIs for finding heavy-weight apps." into gingerbread 
Merge commit 'e57c3a88b99856d1e69fdf115e7c7954594b7385' into gingerbread-plus-aosp

* commit 'e57c3a88b99856d1e69fdf115e7c7954594b7385':
  Add APIs for finding heavy-weight apps.
 2010-06-24 12:42:55 -07:00
Dianne Hackborn
68b8f3aeae Merge "Add APIs for finding heavy-weight apps." into gingerbread 2010-06-24 12:41:01 -07:00
Nick Pelly
ed7f627be0 am db1bae9a: am 9bf39efb: Do not log AT command traffic by default. 
Merge commit 'db1bae9a966150d7f6cc7d3e325cc8a4bf64b978'

* commit 'db1bae9a966150d7f6cc7d3e325cc8a4bf64b978':
  Do not log AT command traffic by default.
 2010-06-24 12:29:06 -07:00
Nick Pelly
0915d189fb am 9bf39efb: Do not log AT command traffic by default. 
Merge commit '9bf39efb1b8527d7c46b20538cbb75bd60900b44' into gingerbread-plus-aosp

* commit '9bf39efb1b8527d7c46b20538cbb75bd60900b44':
  Do not log AT command traffic by default.
 2010-06-24 12:27:46 -07:00
Nick Pelly
ae8c03f19f am 3013fe87: am ab04f978: am d19c397b: (-s ours) Merge "Do not log AT command traffic by default." into froyo 
Merge commit '3013fe87fc524cdd788d52cd95dfbe27b2c5d60a'

* commit '3013fe87fc524cdd788d52cd95dfbe27b2c5d60a':
  Do not log AT command traffic by default.
 2010-06-24 12:20:00 -07:00
Nick Pelly
fe7952dd3b am ab04f978: am d19c397b: (-s ours) Merge "Do not log AT command traffic by default." into froyo 
Merge commit 'ab04f97855a5097815e8e7b99beb42e9b3bac388' into gingerbread-plus-aosp

* commit 'ab04f97855a5097815e8e7b99beb42e9b3bac388':
  Do not log AT command traffic by default.
 2010-06-24 12:17:25 -07:00
Nick Pelly
76d0df9956 am d19c397b: (-s ours) Merge "Do not log AT command traffic by default." into froyo 
Merge commit 'd19c397b04f485e0af5990f3541e703934869290' into gingerbread

* commit 'd19c397b04f485e0af5990f3541e703934869290':
  Do not log AT command traffic by default.
 2010-06-24 12:15:29 -07:00
Nick Pelly
7ed4deb035 Merge "Do not log AT command traffic by default." into froyo 2010-06-24 11:52:39 -07:00