Commit Graph

17847 Commits

Author SHA1 Message Date
Mathias Agopian
c64622bcb0 am 5219a82f: am 8ecfb60a: Merge "Fix a bug that prevented the creation of EGL shared contexts." into gingerbread
Merge commit '5219a82f9d64a7d13401dcf9a0703a0ca2cd842d'

* commit '5219a82f9d64a7d13401dcf9a0703a0ca2cd842d':
  Fix a bug that prevented the creation of EGL shared contexts.
2010-07-02 13:39:38 -07:00
Scott Main
4576e49c70 am dfbad7d3: am 125204b7: am 1c8b6ca4: docs: fix misc broken links
Merge commit 'dfbad7d316a703f42881374b8124183d2c165bf2'

* commit 'dfbad7d316a703f42881374b8124183d2c165bf2':
  docs: fix misc broken links
2010-07-02 13:39:33 -07:00
Mathias Agopian
7c1c974d79 am 8ecfb60a: Merge "Fix a bug that prevented the creation of EGL shared contexts." into gingerbread
Merge commit '8ecfb60a8e74dfcd51bbf3f236d5f414a4d5ac7d' into gingerbread-plus-aosp

* commit '8ecfb60a8e74dfcd51bbf3f236d5f414a4d5ac7d':
  Fix a bug that prevented the creation of EGL shared contexts.
2010-07-02 12:34:22 -07:00
Mathias Agopian
bf83375c73 Merge "Fix a bug that prevented the creation of EGL shared contexts." into gingerbread 2010-07-02 12:32:33 -07:00
Mike Lockwood
395525def2 Merge "MTP: Fix ownership and file permissions for transferred files and folders" 2010-07-02 12:20:33 -07:00
Scott Main
a2a763164f am 125204b7: am 1c8b6ca4: docs: fix misc broken links
Merge commit '125204b737deaaa7719f25d680e96b694c2b8de6' into gingerbread-plus-aosp

* commit '125204b737deaaa7719f25d680e96b694c2b8de6':
  docs: fix misc broken links
2010-07-02 12:16:07 -07:00
Scott Main
1b0d2023c3 am 1c8b6ca4: docs: fix misc broken links
Merge commit '1c8b6ca4d7dd7c8263d5224de6e814681a14afa5' into gingerbread

* commit '1c8b6ca4d7dd7c8263d5224de6e814681a14afa5':
  docs: fix misc broken links
2010-07-02 12:12:56 -07:00
Jamie Gennis
4c39f8f9e2 Fix a bug that prevented the creation of EGL shared contexts.
Change-Id: I6b0ec5ef86abdd4e9083067ba297107cfb094df3
2010-07-02 12:05:07 -07:00
Vasu Nori
d5fece6412 Merge "remove broken, unused and unwanted tests" 2010-07-02 11:46:00 -07:00
Romain Guy
0671e3fb38 Merge "Remove extra leftover logs and use uint32_t instead of unsigned int." 2010-07-02 11:22:20 -07:00
Mike Lockwood
f565090ed5 Merge "MTP: Make MtpDatabase class abstract so we can have multiple implementations" 2010-07-02 11:15:02 -07:00
Vasu Nori
d99ad4df0e Merge "some refactoring and multi-threading fixes" 2010-07-02 11:01:50 -07:00
Andreas Huber
f8c44430d0 am c4be155a: am 2cfd8198: Merge "Add an option to ALooper::start that allows it to call back into java or not." into gingerbread
Merge commit 'c4be155a540695c42bcd6589604f86d300f4548f'

* commit 'c4be155a540695c42bcd6589604f86d300f4548f':
  Add an option to ALooper::start that allows it to call back into java or not.
2010-07-02 10:06:12 -07:00
Andreas Huber
04e2f33acd am 2cfd8198: Merge "Add an option to ALooper::start that allows it to call back into java or not." into gingerbread
Merge commit '2cfd8198cc4e1dcdcae52ae8a0c86b871c87a27e' into gingerbread-plus-aosp

* commit '2cfd8198cc4e1dcdcae52ae8a0c86b871c87a27e':
  Add an option to ALooper::start that allows it to call back into java or not.
2010-07-02 10:04:08 -07:00
Andreas Huber
550892cf23 Merge "Add an option to ALooper::start that allows it to call back into java or not." into gingerbread 2010-07-02 10:02:17 -07:00
Ben Murdoch
2be32a0fed Merge "If no touch icon is specified by a <link> tag, return <host>/apple-touch-icon.png as the touch incon url instead. The DownloadTouchIcon class will handle the case that this file does not exist on the server." 2010-07-02 08:52:36 -07:00
Andreas Huber
119e6839b7 am 9f8c490e: am 5460d126: Merge "Added AMessage::debugString() for debugging purposes." into gingerbread
Merge commit '9f8c490e05f86cca1d60d6b6f383a1a98d7985fb'

* commit '9f8c490e05f86cca1d60d6b6f383a1a98d7985fb':
  Added AMessage::debugString() for debugging purposes.
2010-07-02 08:05:36 -07:00
Andreas Huber
693aa3d961 am 5460d126: Merge "Added AMessage::debugString() for debugging purposes." into gingerbread
Merge commit '5460d126f024a8d6597ce4eb127b51c101724960' into gingerbread-plus-aosp

* commit '5460d126f024a8d6597ce4eb127b51c101724960':
  Added AMessage::debugString() for debugging purposes.
2010-07-02 08:03:20 -07:00
Andreas Huber
a759547c76 Merge "Added AMessage::debugString() for debugging purposes." into gingerbread 2010-07-02 08:00:30 -07:00
Chih-Chung Chang
23103c1532 am d15d0e9f: am 3ef6ebe8: am 7df74471: Merge "Flush binder buffer after setting raw heap to avoid leaking a reference." into froyo
Merge commit 'd15d0e9fd33109f60bd30b26bae782f2fe5531a4'

* commit 'd15d0e9fd33109f60bd30b26bae782f2fe5531a4':
  Flush binder buffer after setting raw heap to avoid leaking a reference.
2010-07-02 07:52:05 -07:00
Chih-Chung Chang
44365c5622 am 3ef6ebe8: am 7df74471: Merge "Flush binder buffer after setting raw heap to avoid leaking a reference." into froyo
Merge commit '3ef6ebe874022c4ec8fbb00067833a6f636c1e2f' into gingerbread-plus-aosp

* commit '3ef6ebe874022c4ec8fbb00067833a6f636c1e2f':
  Flush binder buffer after setting raw heap to avoid leaking a reference.
2010-07-02 07:50:26 -07:00
Chih-Chung Chang
ac2a934aae am 7df74471: Merge "Flush binder buffer after setting raw heap to avoid leaking a reference." into froyo
Merge commit '7df7447112371fb5e46f6084b55ac2ccdfde139d' into gingerbread

* commit '7df7447112371fb5e46f6084b55ac2ccdfde139d':
  Flush binder buffer after setting raw heap to avoid leaking a reference.
2010-07-02 07:48:03 -07:00
Jean-Baptiste Queru
d26e345f29 resolved conflicts for merge of f601ce2c to master
Change-Id: I9e880aacef9d949d83945d41ee5b6eb63ddc4cc7
2010-07-02 07:46:21 -07:00
Chih-Chung Chang
4e459e7676 Merge "Flush binder buffer after setting raw heap to avoid leaking a reference." into froyo 2010-07-02 07:43:31 -07:00
The Android Open Source Project
3541b20f6f merge from open-source master
Change-Id: Ifec16490ea2170728cb6ccb18d2e74fcb3478db6
2010-07-02 07:38:30 -07:00
Scott Main
3e2c5c9441 am 1cbf9482: am 43d9b0ae: am f80372db: Merge "docs: update device dashboard; add historical chart" into froyo
Merge commit '1cbf9482d7d32bac60741d6e512f3ac921f3a6aa'

* commit '1cbf9482d7d32bac60741d6e512f3ac921f3a6aa':
  docs: update device dashboard; add historical chart
2010-07-01 23:38:11 -07:00
Scott Main
caeee7275c am 43d9b0ae: am f80372db: Merge "docs: update device dashboard; add historical chart" into froyo
Merge commit '43d9b0aeb891e10fdb2bd797d0d4c4417abf3bdb' into gingerbread-plus-aosp

* commit '43d9b0aeb891e10fdb2bd797d0d4c4417abf3bdb':
  docs: update device dashboard; add historical chart
2010-07-01 23:35:57 -07:00
Scott Main
925a9abb6d am f80372db: Merge "docs: update device dashboard; add historical chart" into froyo
Merge commit 'f80372dbc0f4a1b80bebfe5f5124de8d31e0996b' into gingerbread

* commit 'f80372dbc0f4a1b80bebfe5f5124de8d31e0996b':
  docs: update device dashboard; add historical chart
2010-07-01 23:33:20 -07:00
Scott Main
60a1589654 Merge "docs: update device dashboard; add historical chart" into froyo 2010-07-01 23:26:58 -07:00
Chih-Chung Chang
b6aef253f4 Flush binder buffer after setting raw heap to avoid leaking a reference.
The problem was:

1. In handleShutter(), thread A in CameraService calls
   registerBuffers(IMemoryHeap) and it's received by thread B
   in system_server. [transaction 1]
2. While thread A is waiting for the reply, thread B calls
   back to thread A to get the id of the heap
   (IMemoryHeap.getHeapID). [transaction 2]
3. Thread A replies transaction 2 and is preemptied in kernel.
   Thread B gets the reply and finishes registerBuffers and send
   reply for transaction 1.
4. When thread A runs again, it gets the reply for transaction 1
   and returns to handleShutter().
5. At this point the transaction buffer for transaction 2 (which
   holds a reference to IMemoryHeap) is not freed because the
   BC_FREE_BUFFER command is kept in thread A's local command
   queue and not sent to the kernel.
6. Normally when thread A makes next transaction, the
   BC_FREE_BUFFER command will be sent together (piggyback) with
   the commands for that transaction. But in this case thread A
   is a callback thread from camera driver, so it does not make
   any binder calls afterwards, and the IMemoryHeap is never freed
   (until the next time handleShutter is called).

Change-Id: I435a258187509bdbbaf353339eb9ea577610cbd2
2010-07-02 12:56:54 +08:00
Mathias Agopian
a59a90b6be am 377e2352: am 7f8edbd9: Merge "remove unused YUV formats" into gingerbread
Merge commit '377e2352574c3cad1f64d222974afd93e821cff1'

* commit '377e2352574c3cad1f64d222974afd93e821cff1':
  remove unused YUV formats
2010-07-01 21:34:05 -07:00
Mathias Agopian
3d5d05ab58 am 7f8edbd9: Merge "remove unused YUV formats" into gingerbread
Merge commit '7f8edbd92737bc610bf4f06ad8a516656be83188' into gingerbread-plus-aosp

* commit '7f8edbd92737bc610bf4f06ad8a516656be83188':
  remove unused YUV formats
2010-07-01 21:31:31 -07:00
Mathias Agopian
1632de8aa4 Merge "remove unused YUV formats" into gingerbread 2010-07-01 21:28:24 -07:00
Mathias Agopian
1764c73b55 remove unused YUV formats
Change-Id: Ie84616f842c7e0329d68e67e65a65d510558004b
2010-07-01 21:17:56 -07:00
Steve Howard
d85a6124b7 am 5c57e03d: am 6ffd9ff0: Merge "Log full exception when failing to inflate notification view" into gingerbread
Merge commit '5c57e03d3dbd474deb73f51b564c4fb929a2a816'

* commit '5c57e03d3dbd474deb73f51b564c4fb929a2a816':
  Log full exception when failing to inflate notification view
2010-07-01 19:43:12 -07:00
Steve Howard
fb3e4a1367 am 6ffd9ff0: Merge "Log full exception when failing to inflate notification view" into gingerbread
Merge commit '6ffd9ff07733a855daeda75416cea88e7456e9d6' into gingerbread-plus-aosp

* commit '6ffd9ff07733a855daeda75416cea88e7456e9d6':
  Log full exception when failing to inflate notification view
2010-07-01 19:41:12 -07:00
Steve Howard
74253bae41 Merge "Log full exception when failing to inflate notification view" into gingerbread 2010-07-01 19:38:48 -07:00
Dianne Hackborn
45293924e7 am 39c921c6: am 8ae5a8e7: Get to the point of being able to do native drawing.
Merge commit '39c921c6e5316696d8c61d1ee465f9b5f894c4ed'

* commit '39c921c6e5316696d8c61d1ee465f9b5f894c4ed':
  Get to the point of being able to do native drawing.
2010-07-01 19:26:57 -07:00
Dianne Hackborn
f0df01ce96 am 8ae5a8e7: Get to the point of being able to do native drawing.
Merge commit '8ae5a8e7c04c7b204b739dfcd5da9e2e0f83e1eb' into gingerbread-plus-aosp

* commit '8ae5a8e7c04c7b204b739dfcd5da9e2e0f83e1eb':
  Get to the point of being able to do native drawing.
2010-07-01 19:25:01 -07:00
Romain Guy
ed8060feb6 Merge "Track the size in memory of the texture cache." 2010-07-01 18:29:42 -07:00
Shimeng (Simon) Wang
1dbe0982e3 Merge "Fix zoom overview logic." 2010-07-01 17:58:03 -07:00
Alex Sakhartchouk
f826b0575c Merge "Start of mesh API cleanup. Switched all native code to go through Mesh class. Removed SimpleMesh Added java Mesh class Will need to port all existing code to use java Mesh, then remove java SimpleMesh." 2010-07-01 16:47:40 -07:00
Eric Laurent
937296f39a am 64fa7f07: am f520411a: am c03befe3: Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Merge commit '64fa7f072a2eff834206ce245f137993b010f5c0'

* commit '64fa7f072a2eff834206ce245f137993b010f5c0':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
2010-07-01 16:41:12 -07:00
Eric Laurent
1856a5c349 am f520411a: am c03befe3: Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Merge commit 'f520411a35db5248934a4b50859ca72e3f865593' into gingerbread-plus-aosp

* commit 'f520411a35db5248934a4b50859ca72e3f865593':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
2010-07-01 16:38:33 -07:00
Eric Laurent
44c72e307d am c03befe3: Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Merge commit 'c03befe3d62eb2a3e1d56fec0ca188a6094d53dd' into gingerbread

* commit 'c03befe3d62eb2a3e1d56fec0ca188a6094d53dd':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
2010-07-01 16:36:02 -07:00
Dianne Hackborn
6c81b2a0c9 am 58f35ff4: am 54a181b1: Make real API for native code to get its window.
Merge commit '58f35ff41601769ca4f357575a9385f16c01b991'

* commit '58f35ff41601769ca4f357575a9385f16c01b991':
  Make real API for native code to get its window.
2010-07-01 16:04:02 -07:00
Dianne Hackborn
5ff2853bdf am 54a181b1: Make real API for native code to get its window.
Merge commit '54a181b1a2b1517a9479b21fbf7705a688232faf' into gingerbread-plus-aosp

* commit '54a181b1a2b1517a9479b21fbf7705a688232faf':
  Make real API for native code to get its window.
2010-07-01 16:00:19 -07:00
Jason Sams
9be04e71c9 Merge "Update fountain with multitouch support." 2010-07-01 15:42:47 -07:00
Romain Guy
155cdf9ff6 Merge "Don't use full screen FBOs, this dramatically increase performance." 2010-07-01 15:29:49 -07:00
James Dong
61c67d6aba am d6ec2175: am 65c83b90: Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbread
Merge commit 'd6ec21751b26a35fc8c912940a2c4720bdbf1083'

* commit 'd6ec21751b26a35fc8c912940a2c4720bdbf1083':
  Refactor Stagefright::StartMPEG4Recording()
2010-07-01 14:15:00 -07:00