26266 Commits

Author SHA1 Message Date
Jason Sams
26657e7388 Merge "Improve multitouch support so pointers other than 0 can change colors." 2010-07-02 15:35:49 -07:00
Jason Sams
c70e5b7988 Merge "Cleanup pass on the mesh api change. Removed all the simple mesh related calls and temporary objects." 2010-07-02 15:11:05 -07:00
Elliott Hughes
def4e4d39d Merge "Defer to ICU's knowledge of language-specific grammatical quantity rules." 2010-07-02 13:42:00 -07:00
Mathias Agopian
56c132c24e 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
838fd9c430 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
5219a82f9d 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
8ecfb60a8e Merge "Fix a bug that prevented the creation of EGL shared contexts." into gingerbread 2010-07-02 12:32:33 -07:00
Mike Lockwood
44f6870631 Merge "MTP: Fix ownership and file permissions for transferred files and folders" 2010-07-02 12:20:33 -07:00
Mike Lockwood
dad69277b7 MTP: Fix ownership and file permissions for transferred files and folders
All new files and folders are created with group sdcard_rw
Permissions for new files are 0664 and directories 0775

Change-Id: I6d508231150f687e2e529112fd47f10e30fa594f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-02 15:19:32 -04:00
Scott Main
dfbad7d316 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
Alex Sakhartchouk
8287a9bc5e Cleanup pass on the mesh api change.
Removed all the simple mesh related calls and temporary objects.

Change-Id: Ic64a72a894e0314f216f10e1cfc0d45b17e2e182
2010-07-02 12:14:26 -07:00
Scott Main
125204b737 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
5149f91c8c Fix a bug that prevented the creation of EGL shared contexts.
Change-Id: I6b0ec5ef86abdd4e9083067ba297107cfb094df3
2010-07-02 12:05:07 -07:00
Vasu Nori
150daa1ae1 Merge "remove broken, unused and unwanted tests" 2010-07-02 11:46:00 -07:00
Romain Guy
216108c492 Merge "Remove extra leftover logs and use uint32_t instead of unsigned int." 2010-07-02 11:22:20 -07:00
Romain Guy
7d139ba2c3 Remove extra leftover logs and use uint32_t instead of unsigned int.
Change-Id: I944f82fe3255de38dc04048cc8bd861f578f01a7
2010-07-02 11:20:34 -07:00
Vasu Nori
ed57af9e89 remove broken, unused and unwanted tests
Change-Id: I804b777b7c434c8a190d70d6a2556e1f157abe70
2010-07-02 11:16:45 -07:00
Mike Lockwood
45d7927dbc Merge "MTP: Make MtpDatabase class abstract so we can have multiple implementations" 2010-07-02 11:15:02 -07:00
Mike Lockwood
8dd2a39bae MTP: Make MtpDatabase class abstract so we can have multiple implementations
Rename existing test database to MtpSqliteDatabase
This is the first step in transitioning to using the media provider database

Change-Id: I5f36c854c6e76a79137c267b000a52ced803776c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-02 14:14:06 -04:00
Scott Main
1c8b6ca4d7 docs: fix misc broken links
Change-Id: I7294276aff0c80498215870d5d72f7a3a9b2c99a
2010-07-02 11:11:34 -07:00
Vasu Nori
cd815158a4 Merge "some refactoring and multi-threading fixes" 2010-07-02 11:01:50 -07:00
Vasu Nori
7501010b71 some refactoring and multi-threading fixes
Change-Id: I7a0497dc2ed7b1e21471d71532558ef243eb9f73
2010-07-02 10:58:29 -07:00
Andreas Huber
5d17247673 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
c4be155a54 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
2cfd8198cc 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
219960e1e2 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
Ben Murdoch
372dfc8bd4 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.

Change-Id: I8ab8fd65b571584d7b648af72c568f0b01c2dcaf
2010-07-02 16:47:39 +01:00
Andreas Huber
763c962278 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
9f8c490e05 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
4f104d99d8 Add an option to ALooper::start that allows it to call back into java or not.
Change-Id: Iec172901a04a575d8d350bd162565f04677c3f26
2010-07-02 08:00:52 -07:00
Andreas Huber
5460d126f0 Merge "Added AMessage::debugString() for debugging purposes." into gingerbread 2010-07-02 08:00:30 -07:00
Chih-Chung Chang
156294969f 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
d15d0e9fd3 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
3ef6ebe874 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
3d7ab176d6 resolved conflicts for merge of f601ce2c to master
Change-Id: I9e880aacef9d949d83945d41ee5b6eb63ddc4cc7
2010-07-02 07:46:21 -07:00
Chih-Chung Chang
7df7447112 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
f601ce2c14 merge from open-source master
Change-Id: Ifec16490ea2170728cb6ccb18d2e74fcb3478db6
2010-07-02 07:38:30 -07:00
Scott Main
39cae6e02b 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
1cbf9482d7 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
43d9b0aeb8 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
f80372dbc0 Merge "docs: update device dashboard; add historical chart" into froyo 2010-07-01 23:26:58 -07:00
Chih-Chung Chang
fe1bac6762 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
d73ddd2c9d 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
377e235257 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
7f8edbd927 Merge "remove unused YUV formats" into gingerbread 2010-07-01 21:28:24 -07:00
Mathias Agopian
61c55c4907 remove unused YUV formats
Change-Id: Ie84616f842c7e0329d68e67e65a65d510558004b
2010-07-01 21:17:56 -07:00
Steve Howard
6d4a911e44 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
5c57e03d3d 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
6ffd9ff077 Merge "Log full exception when failing to inflate notification view" into gingerbread 2010-07-01 19:38:48 -07:00
Dianne Hackborn
4847e630e5 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