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

40839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
7ecd42facf am 227a64fe: Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1 
* commit '227a64fe23b4e6f05dc31e5f51b0f4c142e52b18':
  Fix an NPE on overflow in BatteryStats history.
 2011-11-22 11:04:58 -08:00
Amith Yamasani
6ff0e8a106 Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1 2011-11-22 11:02:49 -08:00
Teng-Hui Zhu
9174795018 am 7257a32b: Merge "HTML5 Video runs into super full screen mode" into ics-mr1 
* commit '7257a32b9ac7cbbb47659ed7bea4ab47e74ac3ec':
  HTML5 Video runs into super full screen mode
 2011-11-22 08:57:02 -08:00
Teng-Hui Zhu
05e688ad9d Merge "HTML5 Video runs into super full screen mode" into ics-mr1 2011-11-22 08:54:59 -08:00
Andreas Huber
54bccc2cfc am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1 
* commit 'cb6fbc89c25298643ab342b4a228e772b0e56978':
  Report a runtime error instead of asserting on malformed avc configuration data.
 2011-11-22 08:41:04 -08:00
Andreas Huber
2389af0dc6 Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1 2011-11-22 08:39:11 -08:00
Daniel Sandler
fde159f6fb am 63188574: Merge "Dismiss system windows when screen savers start." into ics-mr1 
* commit '631885746868cbf03f89e655a6f4fac96449e8a4':
  Dismiss system windows when screen savers start.
 2011-11-22 07:16:47 -08:00
Daniel Sandler
9f96a44b20 Merge "Dismiss system windows when screen savers start." into ics-mr1 2011-11-22 07:15:29 -08:00
Mangesh Ghiware
47aa84dc62 am 8d03007f: Merge "Update zoom (aka display) density from WebView thread." into ics-mr1 
* commit '8d03007f80d74abadfc96926e7cca40d38380bc0':
  Update zoom (aka display) density from WebView thread.
 2011-11-21 23:16:06 -08:00
Mangesh Ghiware
2b7f7eb1fa Merge "Update zoom (aka display) density from WebView thread." into ics-mr1 2011-11-21 23:14:05 -08:00
Romain Guy
96e41aaca4 am 723218b4: Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1 
* commit '723218b4f428944bdb11b25d0b30ece56283f696':
  Hide ManagedEGLContext until we are sure this is the correct API.
 2011-11-21 21:20:57 -08:00
Romain Guy
14986f7cb5 Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1 2011-11-21 21:18:51 -08:00
James Dong
9056b5656c am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1 
* commit '02740dc49df86fc94c872454aa9db98737d5e8c8':
  Fix log spamming during time lapse video recording
 2011-11-21 20:29:59 -08:00
James Dong
ef94a3fb02 Merge "Fix log spamming during time lapse video recording" into ics-mr1 2011-11-21 20:28:27 -08:00
Romain Guy
f178f8e1e5 am 1766b0e2: Fix the build 
* commit '1766b0e25de5a66f9d0f6e73a2c342272fcadc71':
  Fix the build
 2011-11-21 18:31:29 -08:00
Wu-cheng Li
01dcd424f6 am e7005ec9: Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1 
* commit 'e7005ec9582f11744fa74d9c5c9562f9e4be04dc':
  Move Camera.Sound to a stand-alone class CameraSound.
 2011-11-21 18:13:06 -08:00
Wu-cheng Li
92bc62e00b Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1 2011-11-21 18:10:52 -08:00
Mathias Agopian
82ac31f9fa am 07a2d831: Merge "don\'t report an error when disconnecting from an abandoned surfacetexture" into ics-mr1 
* commit '07a2d831903774e07c1c6b6dd5c7c06bf8ca176a':
  don't report an error when disconnecting from an abandoned surfacetexture
 2011-11-21 18:00:52 -08:00
Mathias Agopian
4869991f74 am 8646cd42: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1 
* commit '8646cd42df5edc5f5b9c52d6ab5309821e875656':
  enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
 2011-11-21 17:58:42 -08:00
Romain Guy
33a771f7da am 8cd39e3a: Merge "Notify views when EGL resources are about to be destroyed Bug #5639899" into ics-mr1 
* commit '8cd39e3a104d0739fd2f1ae73e5f4081f1528c6c':
  Notify views when EGL resources are about to be destroyed Bug #5639899
 2011-11-21 17:58:40 -08:00
Mathias Agopian
7723773df3 Merge "don't report an error when disconnecting from an abandoned surfacetexture" into ics-mr1 2011-11-21 17:57:31 -08:00
Mathias Agopian
75cf5a7480 Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1 2011-11-21 17:57:20 -08:00
Romain Guy
7e7fa2543d Merge "Notify views when EGL resources are about to be destroyed Bug #5639899" into ics-mr1 2011-11-21 17:57:05 -08:00
Adam Powell
07281fa255 am fb0784da: Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1 
* commit 'fb0784da5f602bf6410ef914d625c3cedfa11e9f':
  Fix bug 5521467 - Monkeys and ActionBar custom tab views
 2011-11-21 17:36:20 -08:00
Adam Powell
a9273339c2 Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1 2011-11-21 17:34:57 -08:00
Nick Pelly
f3e284a1e0 am 043a8b14: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 
* commit '043a8b149dc31d3e3242ccf0cadc580702c99552':
  Replace vendor specific NfcGoogle.apk with generic Nfc.apk
 2011-11-21 16:05:30 -08:00
Nick Pelly
33733ed06b Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 2011-11-21 16:03:40 -08:00
Jamie Gennis
a3677781d0 am b8d20d02: Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1 
* commit 'b8d20d028ca590f6a9c57e0e8fee5e5f80e9ae54':
  EGL: Use cache sizes defined in the BoardConfig
 2011-11-21 15:56:12 -08:00
Jamie Gennis
f59fa92c30 am 53cf2020: Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1 
* commit '53cf20202a3848a6c61b5229814268180a3d2f16':
  SurfaceTexture: fix a couple tests
  EGL: default to swap interval 1
  SurfaceTexture: clean up some tests
 2011-11-21 15:56:11 -08:00
Jamie Gennis
e011aa2b0f Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1 2011-11-21 15:54:54 -08:00
Jamie Gennis
b440acd1c8 Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1 
* changes:
  SurfaceTexture: fix a couple tests
  EGL: default to swap interval 1
  SurfaceTexture: clean up some tests
 2011-11-21 15:54:40 -08:00
Eric Fischer
092ecfb373 am 68f0d47e: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '68f0d47e8ee045dffb5f59c67cc77f38598472c5':
  Import revised translations. DO NOT MERGE
 2011-11-21 15:31:36 -08:00
Eric Fischer
c4411803fb Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-21 15:29:06 -08:00
Chia-chi Yeh
09839e416e am bfd85f9a: Merge "SIP: turn off verbose logs." into ics-mr1 
* commit 'bfd85f9aca13aba2b954ddf3d8c6f6eb26e35f25':
  SIP: turn off verbose logs.
 2011-11-21 15:22:00 -08:00
Chia-chi Yeh
7ea0388c04 Merge "SIP: turn off verbose logs." into ics-mr1 2011-11-21 15:19:35 -08:00
Jamie Gennis
e3603d7d09 SurfaceTexture: fix a couple tests 
This change fixes some robustness issues with the
EglDestroySurfaceUnrefsBuffers and
EglDestroySurfaceAfterAbandonUnrefsBuffers tests.  The tests previously
depended upon GL implementation details that should not have been relied
upon.

Change-Id: I37fd43b56568efe1dbe69d85e892be8a1cf44d20
 2011-11-21 14:38:15 -08:00
Jamie Gennis
59769469e4 EGL: default to swap interval 1 
This change explicitly sets swap interval 1 on the window when an
EGLSurface is created to render to it.

Change-Id: I91eb29dbee3ae4a55076b921f084d503fbe94e03
 2011-11-21 14:37:29 -08:00
John Reck
e55526fb1c am 0507ac4d: Use isHighEndGfx to determine texture pool 
* commit '0507ac4d94fc0ecb775391a7e80c921614f88a58':
  Use isHighEndGfx to determine texture pool
 2011-11-21 14:14:06 -08:00
Jamie Gennis
6f4cdfe0db SurfaceTexture: clean up some tests 
This change cleans a few things up in the SurfaceTexture tests:
- Wraps a few long lines.
- Refactors the multithreading portions of SurfaceTextureGLToGLTest into
  a new test fixture called SurfaceTextureGLThreadToGLTest.
- Changes some of the tests that were creating their own EGLSurface to
  use the SurfaceTextureGLToGLTest fixture.
- Reorders the test functions so that they are immediately below to the
  test fixture that they use.

Change-Id: I0491ce3528a7ff2b4f1e83602ba290269c087297
 2011-11-21 11:52:02 -08:00
Jamie Gennis
89c1d61c16 EGL: Use cache sizes defined in the BoardConfig 
This change introduces two new BoardConfig variables to control the size
limits of the EGL blob cache.  MAX_EGL_CACHE_ENTRY_SIZE is the size
limit for values inserted into the cache, and MAX_EGL_CACHE_SIZE is the
size limit for all entries in the entire cache (including both keys and
values).  If either of these BoardConfig variables are not defined then
a default size limit is used instead.

Change-Id: I6703d93f966b6389c6499f23d841e42339f9c9d7
 2011-11-21 11:48:17 -08:00
Kristian Monsen
2fa8f3f966 am 7859c184: Merge "Improving PictureListener deprecating comments" into ics-mr1 
* commit '7859c1842c1f2e3c43415dfb5337a0b005bdb1c4':
  Improving PictureListener deprecating comments
 2011-11-20 07:29:09 -08:00
Kristian Monsen
2f399ff6ef Merge "Improving PictureListener deprecating comments" into ics-mr1 2011-11-20 07:26:59 -08:00
Daniel Sandler
c05ee94e5f am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1 
* commit '9b5d7a59f336a96e73f5f485f6e366e078a70497':
  Dreams (now Screen Candy) development.
 2011-11-19 20:44:40 -08:00
Daniel Sandler
faed2acf61 Merge "Dreams (now Screen Candy) development." into ics-mr1 2011-11-19 20:42:19 -08:00
The Android Open Source Project
cd7f56fdd2 am 0e2c2f39: Reconcile with ics-mr0-release 
* commit '0e2c2f3971eb4b246a5c1b198370e003668f53ee':
 2011-11-18 15:53:25 -08:00
The Android Open Source Project
e1b2b00d75 Reconcile with ics-mr0-release 
Change-Id: I61ef83c288814c62369fabdcf50d867708f05f51
 2011-11-18 15:49:39 -08:00
The Android Automerger
14d47ba602 merge in ics-mr0-release history after reset to ics-mr0 2011-11-18 15:37:45 -08:00
Marco Nelissen
ddd2a1feb8 am 7ff7821a: am d4b22ab4: status_t != bool 
* commit '7ff7821a601a39fffb318e29873957b4a3703c46':
  status_t != bool
 2011-11-18 15:10:54 -08:00
Marco Nelissen
35ab318b31 am d4b22ab4: status_t != bool 
* commit 'd4b22ab4889f9b1885bfc0dc45667c846a171a98':
  status_t != bool
 2011-11-18 15:07:21 -08:00
Svetoslav Ganov
23a76d9a8d am d8a3cabc: Merge "Text selection AccessibilityEvents are missing text." into ics-mr1 
* commit 'd8a3cabcb11c02c54b76590e0f60c32b43b9f2fc':
  Text selection AccessibilityEvents are missing text.
 2011-11-18 14:41:29 -08:00