ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
31,628 Commits 2 Branches 0 Tags 54 MiB
bd35d2d88c
Commit Graph

31628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ken Sumrall
06b72dc76e am c7fcc507: Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1 
* commit 'c7fcc5076fb2988fba699a2167d19475fd58ed0b':
  Teach the framework to use the new android_reboot() function.
 2011-03-10 19:27:05 -08:00
Ken Sumrall
45d6471556 Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1 2011-03-10 19:24:42 -08:00
Jamie Gennis
0060c85ced am 34bb677f: am b2e606f5: Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1 
* commit '34bb677f3fa7f3e476849df3c7873256a463f598':
  SurfaceFlinger: Respect the PROTECTED gralloc bit.
 2011-03-10 18:10:24 -08:00
Jamie Gennis
da38c1f186 am b2e606f5: Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1 
* commit 'b2e606f5f175906ab8c578cb9ba03c728154c50c':
  SurfaceFlinger: Respect the PROTECTED gralloc bit.
 2011-03-10 18:07:57 -08:00
Jamie Gennis
c2cc1b3f97 Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1 2011-03-10 18:06:32 -08:00
Mathias Agopian
497cfd70c2 am 92b56b8c: am e90c4998: Merge "fix [4025681] continuous sensors should not try to send an event as soon as they\'re activated" into honeycomb-mr1 
* commit '92b56b8c5bd9a523f5d688c859bf5f74ac386b9e':
  fix [4025681] continuous sensors should not try to send an event as soon as they're activated
 2011-03-10 17:40:04 -08:00
Mathias Agopian
ca9cbe8fa2 am e90c4998: Merge "fix [4025681] continuous sensors should not try to send an event as soon as they\'re activated" into honeycomb-mr1 
* commit 'e90c4998b514f738b3655e55b51a38119b8c5f23':
  fix [4025681] continuous sensors should not try to send an event as soon as they're activated
 2011-03-10 17:37:47 -08:00
Mathias Agopian
069160eba0 Merge "fix [4025681] continuous sensors should not try to send an event as soon as they're activated" into honeycomb-mr1 2011-03-10 17:36:15 -08:00
Teng-Hui Zhu
a820784590 am 37ee248b: am 2fc79763: Merge "Inline HTML5 Video support" into honeycomb-mr1 
* commit '37ee248b526d3cdefbb0d401ec14b740b655896b':
  Inline HTML5 Video support
 2011-03-10 17:15:08 -08:00
Teng-Hui Zhu
7b45a5b73a am 2fc79763: Merge "Inline HTML5 Video support" into honeycomb-mr1 
* commit '2fc7976399e5f0f4c6e1dae528df727e7dcbdc8e':
  Inline HTML5 Video support
 2011-03-10 17:13:03 -08:00
Teng-Hui Zhu
40ce089c12 Merge "Inline HTML5 Video support" into honeycomb-mr1 2011-03-10 17:10:29 -08:00
Adam Powell
fe428c671c am 6615362b: am cf63b66c: Merge "Fix bug 4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1 
* commit '6615362b14131052c5055c0b17c3a2ade474a57d':
  Fix bug 4080407 - Browser stuck after scrolling- page stops responding
 2011-03-10 17:10:03 -08:00
Adam Powell
4bbbdba6b3 am cf63b66c: Merge "Fix bug 4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1 
* commit 'cf63b66cfd49dda473806a3b001db72fca48af5a':
  Fix bug 4080407 - Browser stuck after scrolling- page stops responding
 2011-03-10 17:07:52 -08:00
Adam Powell
672f2f2b66 Merge "Fix bug 4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1 2011-03-10 17:06:11 -08:00
David Li
65948aa046 GLES2Debugger: Added DbgContext and vertex data capturing. 
Send VBO related commands to client, which tracks the state.
Maintain index buffer content and vertex attrib pointer/buffer state on server.
During glDrawArrays/Elements, send user memory data to client.

Change-Id: Ia920e90479329b301ae4b5735e833eeb20293c94
Signed-off-by: David Li <davidxli@google.com>
 2011-03-10 16:40:37 -08:00
Gloria Wang
492d475bbe Merge "Fix for bug 3477330 This patch fixs a crash bug caused by using a NULL DecryptHandle pointer. Fix by using sp<DecryptHandle> instead." 2011-03-10 16:37:21 -08:00
Jamie Gennis
7a4d0dfd43 SurfaceFlinger: Respect the PROTECTED gralloc bit. 
This change makes SurfaceFlinger treat layers for which the active
buffer has the GRALLOC_USAGE_PROTECTED bit set as if they have the
'secure' flag set.

Change-Id: Ic60b6513a63e4bb92ec6ce9fd12fd39b4ba5f674
Bug: 4081304
 2011-03-10 16:25:48 -08:00
Scott Main
84ca8531df am b9027e69: am dc8b70ca: am c411b4ec: Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb 
* commit 'b9027e69471a5dd2398b58d369c079c80d70f4b6':
  docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758
 2011-03-10 16:01:52 -08:00
Scott Main
3b51440fd0 am a810d02c: am dd7617b3: am 0722cec0: Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb 
* commit 'a810d02ce075893fd0f81dbd2fd97089365efd68':
  docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300
 2011-03-10 16:01:49 -08:00
Xia Wang
57628043d4 am 05ab5caa: am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1 
* commit '05ab5caa80fdea6bba8ec2fa758be8e9c7ad4b3d':
  Add WifiStressTest to Wi-Fi only test suite.
 2011-03-10 16:01:45 -08:00
Scott Main
3c041ed2ff am dc8b70ca: am c411b4ec: Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb 
* commit 'dc8b70cabc23316e349aaf2fe03bcc830dd66e6c':
  docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758
 2011-03-10 15:57:38 -08:00
Scott Main
229042cb48 am dd7617b3: am 0722cec0: Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb 
* commit 'dd7617b3276c0a666c17ae2fb3ab02d5dce4b354':
  docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300
 2011-03-10 15:57:34 -08:00
Xia Wang
af268fff07 am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1 
* commit 'cf994cc57df33121cea7a0082c8ea55ca125279c':
  Add WifiStressTest to Wi-Fi only test suite.
 2011-03-10 15:57:27 -08:00
Scott Main
3b4f8b2ca5 am c411b4ec: Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb 
* commit 'c411b4ec343406a34db6f53e8a0f7ee9aa417c0d':
  docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758
 2011-03-10 15:40:32 -08:00
Scott Main
0b01fccb6d am 0722cec0: Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb 
* commit '0722cec0f1e921a1d12d3c0dbb8b135d309b2031':
  docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300
 2011-03-10 15:40:23 -08:00
Xia Wang
416132888b Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1 2011-03-10 15:29:12 -08:00
Scott Main
e3fd9b8044 Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb 2011-03-10 15:17:42 -08:00
Rajneesh Chowdury
be2d91b8f7 am a4865ec7: am a7118e33: Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1 
* commit 'a4865ec73f9faccd6dc442cbc6d78666b1a69b28':
  Fix for 4080402 NPE in Transition.setDuration
 2011-03-10 15:14:27 -08:00
Scott Main
ffb7903b47 Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb 2011-03-10 15:13:49 -08:00
Rajneesh Chowdury
ba0f2a3467 am a7118e33: Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1 
* commit 'a7118e33b494b26bfbd37c895a1c412cd5da56ec':
  Fix for 4080402 NPE in Transition.setDuration
 2011-03-10 15:12:34 -08:00
Rajneesh Chowdury
85df20657a Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1 2011-03-10 15:10:39 -08:00
Xia Wang
e37f468ed4 resolved conflicts for merge of 16cbe575 to honeycomb-mr1 
Change-Id: Ic55f0bdeb5fc63bdabb4f4546fa7e1aa3201a6e0
 2011-03-10 15:09:46 -08:00
Eric Fischer
aeef3f5d8a am adcaca26: (-s ours) am ff25b975: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'adcaca260ee758d446bcd0c35d9f267bc3e62049':
  Import revised translations.  DO NOT MERGE
 2011-03-10 14:51:06 -08:00
Eric Fischer
29b37fc799 am ff25b975: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'ff25b975052ddf0e74627cccca742cddd1c8e2f2':
  Import revised translations.  DO NOT MERGE
 2011-03-10 14:47:57 -08:00
Eric Fischer
8e59190afd Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-10 14:46:18 -08:00
Xia Wang
696229eecf Merge "Add WifiStressTest to Wi-Fi only test suite." into honeycomb 2011-03-10 14:21:50 -08:00
Jim Miller
77dd1e9d02 Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView" 2011-03-10 14:04:05 -08:00
Justin Ho
e280e97070 am 9caea5ef: am fa1d72c8: Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1 
* commit '9caea5efd9190fdadc6ab8261c107134eb61df47':
  New textfield search assets Bug: 3321263
 2011-03-10 13:57:51 -08:00
Justin Ho
94b95f7ee5 am fa1d72c8: Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1 
* commit 'fa1d72c894af5b2ab622a1d7612a3307d3f8b2e1':
  New textfield search assets Bug: 3321263
 2011-03-10 13:55:21 -08:00
Eric Fischer
e48a98358f am b23196d6: (-s ours) am 8d257f85: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'b23196d6475a29d8d973d50e9f9ef867ba486e5d':
  Import revised translations.  DO NOT MERGE
 2011-03-10 13:53:58 -08:00
Justin Ho
5600135d77 Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1 2011-03-10 13:53:48 -08:00
Eric Fischer
e00be2b00d am 8d257f85: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '8d257f85acc3316b9ba451337f7cbea9000eb8cf':
  Import revised translations.  DO NOT MERGE
 2011-03-10 13:46:28 -08:00
Gilles Debunne
277b962db9 Merge "Removed updateCursorControllerPositions hidden method." 2011-03-10 13:36:32 -08:00
Eric Fischer
6f186ab677 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-10 11:42:24 -08:00
Gilles Debunne
030cbd6536 Merge "Empty spans are not considered in text layout/rendering process." 2011-03-10 10:21:34 -08:00
Gilles Debunne
1ff49c4fca Merge "Fixed TextView#onTextChanged documentation." 2011-03-10 10:21:20 -08:00
Wink Saville
e8516d1a37 Merge "Telephony: Rename lte_on_cdma property." 2011-03-10 09:53:54 -08:00
Shimeng (Simon) Wang
497c0c9ef6 am 40f24016: am 0837fde9: Merge "Don\'t limit zoom scale change by the minimum increment." into honeycomb-mr1 
* commit '40f240166a5d4c92690aeb991f1711bf3a733ef5':
  Don't limit zoom scale change by the minimum increment.
 2011-03-10 09:49:49 -08:00
Kristian Monsen
4cdf47bca5 am 4543b8d4: am 79b87df5: Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1 
* commit '4543b8d4b0fe6bebbf619fa7793a55e41eb1eeff':
  Fix for bug 4064291 WebView uses PackageManager#getInstalledApps
 2011-03-10 09:49:42 -08:00
Shimeng (Simon) Wang
b3f3a843b7 am 0837fde9: Merge "Don\'t limit zoom scale change by the minimum increment." into honeycomb-mr1 
* commit '0837fde9fd9e29f8ef66a3fe00764e15a6f3d515':
  Don't limit zoom scale change by the minimum increment.
 2011-03-10 09:07:22 -08:00