Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,853 Commits 3 Branches 0 Tags
7406eafe7f9774e095383d4ea14f776808da562e
Commit Graph

22853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
7406eafe7f should fix the build 
Change-Id: I9957fc43d5fce317479f6c55fb0b9612bff9a495
 2010-05-12 18:26:13 -07:00
Mathias Agopian
2f0e6753d6 Merge "SharedBufferStack now can grow up to 16 buffers." into kraken 2010-05-12 17:36:46 -07:00
Mathias Agopian
6a70cb8a38 Merge "Refactor some code in surfaceflinger in preparation of upcoming changes" into kraken 2010-05-12 17:35:24 -07:00
Mathias Agopian
ca64ed6a81 Merge "remove the "memcpy" hack" into kraken 2010-05-12 17:35:12 -07:00
Mathias Agopian
59751dbf7d SharedBufferStack now can grow up to 16 buffers. 
there is a new resize() api, which currently only allows growing.

Change-Id: Ia37b81b73be466d2491ffed7f3a23cd8e113c6fe
 2010-05-12 17:28:20 -07:00
Mathias Agopian
9f2c4fd9a1 Refactor some code in surfaceflinger in preparation of upcoming changes 
the new TextureMagager class now handle texture creation and upload
as well as EGL image creation and binding to GraphicBuffers. This is
used indirectly by Layer and directly by LayerBuffer

the new BufferManager class handles the set of buffers used for a
Layer (Surface), it abstracts how many buffer there is as well as
the use of EGLimage vs. regular texture ops (glTexImage2D).

Change-Id: I2da1ddcf27758e6731400f6cc4e20bef35c0a39a
 2010-05-12 17:26:22 -07:00
Mathias Agopian
aca2ee8a70 remove the "memcpy" hack 
this hack was used for gpus that don't support cached buffers
for s/w clients. currently we have no gpu with this issue.
this removes quite a bit of complexity.

Change-Id: I72564669f124f92805030e61983711f61c76b6d9
 2010-05-12 15:44:26 -07:00
Scott Main
8b518577ce am c99c401d: am 38b523af: Merge "docs: add missing path-permissions document" into froyo 
Merge commit 'c99c401d93f94d4243ed8cdd5fec101efc9ee265' into kraken

* commit 'c99c401d93f94d4243ed8cdd5fec101efc9ee265':
  docs: add missing path-permissions document
 2010-05-12 15:35:47 -07:00
Scott Main
6376833687 am 8b27c965: am f0e4ae56: Merge "docs: fix broken links" into froyo 
Merge commit '8b27c965c8a4cb8ceb4b50484d55270758703768' into kraken

* commit '8b27c965c8a4cb8ceb4b50484d55270758703768':
  docs: fix broken links
 2010-05-12 15:35:41 -07:00
Grace Kloba
2fb3b394fb am bfc63c7b: am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly. 
Merge commit 'bfc63c7b83160fd3e771e5187d317348e72d6c27' into kraken

* commit 'bfc63c7b83160fd3e771e5187d317348e72d6c27':
  The default AlertDialog allows cancel. But the default
 2010-05-12 15:35:37 -07:00
Scott Main
c99c401d93 am 38b523af: Merge "docs: add missing path-permissions document" into froyo 
Merge commit '38b523af5c233dd5f8631ada2cd80b2d75b0efde' into froyo-plus-aosp

* commit '38b523af5c233dd5f8631ada2cd80b2d75b0efde':
  docs: add missing path-permissions document
 2010-05-12 15:33:38 -07:00
Scott Main
8b27c965c8 am f0e4ae56: Merge "docs: fix broken links" into froyo 
Merge commit 'f0e4ae563228db584041d517672aeadacecba61f' into froyo-plus-aosp

* commit 'f0e4ae563228db584041d517672aeadacecba61f':
  docs: fix broken links
 2010-05-12 15:33:35 -07:00
Grace Kloba
bfc63c7b83 am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly. 
Merge commit '336d7dcb105a43ee4de51fd0f26f277c63662f02' into froyo-plus-aosp

* commit '336d7dcb105a43ee4de51fd0f26f277c63662f02':
  The default AlertDialog allows cancel. But the default
 2010-05-12 15:33:30 -07:00
The Android Open Source Project
1f35de2a2e am 79090cb3: merge from open-source master 
Merge commit '79090cb3da132d07cd3888ef9242df9872fb4aa1' into kraken

* commit '79090cb3da132d07cd3888ef9242df9872fb4aa1':
  Change license for the UUS Information file.
  Remove ProximityAlerts Receiver when last ProximityAlert expires.
 2010-05-12 15:06:13 -07:00
Scott Main
38b523af5c Merge "docs: add missing path-permissions document" into froyo 2010-05-12 15:01:31 -07:00
The Android Open Source Project
d6e24ca28b am 4adacd23: merge from open-source master 
Merge commit '4adacd23d4c91569b16fe50419f1a91f68d805bd' into kraken

* commit '4adacd23d4c91569b16fe50419f1a91f68d805bd':
  Add support for EVDO Rev B
 2010-05-12 14:56:00 -07:00
Kenny Root
e8621534db Merge "ZipUtilsRO rewrite based on Dalvik Zip rewrite" into kraken 2010-05-12 14:54:42 -07:00
The Android Open Source Project
79090cb3da merge from open-source master 
Change-Id: Ifb008642faddf6b83769cdaa5bd67d21591b9eaa
 2010-05-12 14:54:38 -07:00
Scott Main
f0e4ae5632 Merge "docs: fix broken links" into froyo 2010-05-12 14:53:35 -07:00
The Android Open Source Project
4adacd23d4 merge from open-source master 
Change-Id: If6730b50627b2231bd345e594d8d30a37557849e
 2010-05-12 14:53:25 -07:00
Scott Main
5dd0fd5c89 docs: fix broken links 
Change-Id: I2720ce4fe30b1e6ff35b91f48a98ead8999ed1ab
 2010-05-12 14:49:38 -07:00
The Android Open Source Project
2a2174a7bd am ccfd99b1: merge from open-source master 
Merge commit 'ccfd99b1e2a64c72ec433ebf5cf98d644ab24614' into kraken

* commit 'ccfd99b1e2a64c72ec433ebf5cf98d644ab24614':
  Support for User to User Signaling (UUS)
 2010-05-12 14:41:40 -07:00
The Android Open Source Project
ccfd99b1e2 merge from open-source master 
Change-Id: Ib092e6ae5151bbcdf56b9b3a7adbaee7bb5df8b5
 2010-05-12 14:39:38 -07:00
Grace Kloba
336d7dcb10 The default AlertDialog allows cancel. But the default 
JSConfim doesn't have a cancel listener. So when
user cancel the dialog, we do not wake up the WebCoreThread.
The same code is already done for JSPrompt dialog correctly.

Fix http://b/issue?id=2679139
 2010-05-12 14:28:07 -07:00
The Android Open Source Project
72a6af1ab1 am 7d952644: merge from open-source master 
Merge commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5' into kraken

* commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5':
  Support to display message when operation is blocked due to FDN being enabled
 2010-05-12 14:12:25 -07:00
The Android Open Source Project
7d9526445c merge from open-source master 
Change-Id: Ib5ea9745c2b652d64646e3e28c12e63815321ff9
 2010-05-12 14:10:23 -07:00
The Android Open Source Project
63ece47fec am 2a9ae01f: merge from open-source master 
Merge commit '2a9ae01f74e7273ce0d1045754597ea78b88ba69' into kraken

* commit '2a9ae01f74e7273ce0d1045754597ea78b88ba69':
  Corrected repeat count for key repeat in input device.
 2010-05-12 12:44:27 -07:00
The Android Open Source Project
2a9ae01f74 merge from open-source master 
Change-Id: I24ecfac151c0ddc27237d711c95b8fe488d7931b
 2010-05-12 12:33:35 -07:00
The Android Open Source Project
55bef14f15 am fb234bbe: merge from open-source master 
Merge commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2' into kraken

* commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2':
  Notify user regarding invalid number during MO call.
  Build software AGL library with correct get_tls() macro for ARMv7 based platforms
  Fix glReadPixels() to verify that both x and y are non-negative.
 2010-05-12 12:13:18 -07:00
Naveen Kalla
052203e50c Change license for the UUS Information file. 
Change-Id: Idd77e9078354a46605142c2eb704823aaa7d560d
 2010-05-12 12:02:09 -07:00
The Android Open Source Project
fb234bbe5e merge from open-source master 
Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c
 2010-05-12 11:58:14 -07:00
Scott Main
5385cc20f6 docs: add missing path-permissions document 
Change-Id: I926f6ead8babbb66ead386890c143e1bc3ddf229
 2010-05-12 11:31:03 -07:00
Dirk Dougherty
e46defea3a am 68b37d14: am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo 
Merge commit '68b37d14708414d3cee418024c178f0a3c7d8b5b' into kraken

* commit '68b37d14708414d3cee418024c178f0a3c7d8b5b':
  Doc change: remove Google I/O 09 from carousel.
 2010-05-12 11:10:10 -07:00
Dirk Dougherty
68b37d1470 am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo 
Merge commit 'a04202b3258845688bcd8c6208222235569df733' into froyo-plus-aosp

* commit 'a04202b3258845688bcd8c6208222235569df733':
  Doc change: remove Google I/O 09 from carousel.
 2010-05-12 11:08:46 -07:00
Dirk Dougherty
a04202b325 Merge "Doc change: remove Google I/O 09 from carousel." into froyo 2010-05-12 11:05:03 -07:00
Dirk Dougherty
b0e243b62a Doc change: remove Google I/O 09 from carousel. 
Change-Id: I5b97ceef5316930266d1b4581217afad74129372
 2010-05-12 10:48:31 -07:00
Jean-Michel Trivi
afbc5fad91 Fix build Remove from API 9 definition the two methods that were 
removed from API 8.

Change-Id: I4b443a257b5674a7493ccda0a0427999e369fb4f
 2010-05-12 10:43:22 -07:00
Scott Main
1d9b25a0cc am 0d967ff0: am 18dc51d4: Merge "docs: fix broken anchor names" into froyo 
Merge commit '0d967ff0e2745bc208c3318a67d8ca688c3ea3d9' into kraken

* commit '0d967ff0e2745bc208c3318a67d8ca688c3ea3d9':
  docs: fix broken anchor names
 2010-05-12 07:57:13 -07:00
Dirk Dougherty
dd142ac3a9 am 052e2102: am 0d1b0814: Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files. 
Merge commit '052e2102df8e45af2797faff7aefda26aeb345d7' into kraken

* commit '052e2102df8e45af2797faff7aefda26aeb345d7':
  Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.
 2010-05-12 07:57:10 -07:00
Dirk Dougherty
a1cdf27993 am 89f74cf6: am 4d5275e7: Merge "Doc change: update diff report 7-> 8" into froyo 
Merge commit '89f74cf66c635c8835d6fc4057c6901037f704dd' into kraken

* commit '89f74cf66c635c8835d6fc4057c6901037f704dd':
  Doc change: update diff report 7-> 8
 2010-05-12 07:57:06 -07:00
Scott Main
812266dda4 am a250e328: am 827a50dd: Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo 
Merge commit 'a250e3287dea625930b1591b7139decc304bf76b' into kraken

* commit 'a250e3287dea625930b1591b7139decc304bf76b':
  docs: remove the dashboard from the sidenav for the offline docs
 2010-05-12 07:57:02 -07:00
Brett Chabot
4924ea490f am c8e84e12: am b4c9a8f6: Merge "Fix imf tests." into froyo 
Merge commit 'c8e84e12beb876f904d0090fe021beae73722786' into kraken

* commit 'c8e84e12beb876f904d0090fe021beae73722786':
  Fix imf tests.
 2010-05-12 07:56:54 -07:00
Scott Main
9809015b48 am 21f18e96: am bb129dc5: docs: make Notifying the User an expandable list 
Merge commit '21f18e9633967e69ebe7a172b902420fec485bba' into kraken

* commit '21f18e9633967e69ebe7a172b902420fec485bba':
  docs: make Notifying the User an expandable list
 2010-05-12 07:56:49 -07:00
Scott Main
5b46aa36b6 am d522b270: am a225e3b1: docs: add quickview box with "see also" links for some articles 
Merge commit 'd522b270a90cdd5f9bdedeb402b4738cfa294ee5' into kraken

* commit 'd522b270a90cdd5f9bdedeb402b4738cfa294ee5':
  docs: add quickview box with "see also" links for some articles
 2010-05-12 07:56:45 -07:00
Scott Main
1dc7c4ab66 am 0130e383: am 6bc3304b: Merge "docs: remove allowBackup attribute from documentation" into froyo 
Merge commit '0130e3837638b998ff28786618bc6a7fc6417711' into kraken

* commit '0130e3837638b998ff28786618bc6a7fc6417711':
  docs: remove allowBackup attribute from documentation
 2010-05-12 07:56:40 -07:00
Xavier Ducrohet
08eff49f09 am d9712b69: am b1235a57: Merge "Hide two audio focus methods." into froyo 
Merge commit 'd9712b69ce529fbf50b3b837032c1dc40e623381' into kraken

* commit 'd9712b69ce529fbf50b3b837032c1dc40e623381':
  Hide two audio focus methods.
 2010-05-12 07:56:29 -07:00
Marco Nelissen
550884e2f3 am bbafdc64: am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo 
Merge commit 'bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b' into kraken

* commit 'bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b':
  Don't clear the _data column in the audio_meta table, since it isn't
 2010-05-12 07:56:24 -07:00
Dianne Hackborn
bf00233b88 am b6e1ec19: am 037cd341: Merge "Fix issue #2676378: Activity Manager Crash on FRF40" into froyo 
Merge commit 'b6e1ec19dd73cb55baef538a9119bcac0f8b9366' into kraken

* commit 'b6e1ec19dd73cb55baef538a9119bcac0f8b9366':
  Fix issue #2676378: Activity Manager Crash on FRF40
 2010-05-12 07:56:19 -07:00
Scott Main
856f0bad16 am 84a30dbf: am 5cdf5fdc: docs: add document about app install location 
Merge commit '84a30dbff1d6e04fd7660983233ae5502b414b07' into kraken

* commit '84a30dbff1d6e04fd7660983233ae5502b414b07':
  docs: add document about app install location
 2010-05-12 07:56:13 -07:00
Dirk Dougherty
a38f5e705c am 712f6408: am 8acb68e9: Merge "Doc Change: Docs for NDK r4." into froyo 
Merge commit '712f6408140af90477bccbc64f598c5e51833c7b' into kraken

* commit '712f6408140af90477bccbc64f598c5e51833c7b':
  Doc Change: Docs for NDK r4.
 2010-05-12 07:56:07 -07:00