summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Merge "Modified libdrm to support SuperH platform"Jeff Hamilton2010-05-142-1/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Modified libdrm to support SuperH platformShin-ichiro KAWASAKI2009-07-032-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added USTL_ANDROID_SH defination while build on SuperH platform
* | | | | | | | | | | am 5f1beda1: Merge "Make the SSID field of WifiConfiguration consistent with ↵Chung-yih Wang2010-05-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API description." into froyo Merge commit '5f1beda18fc7709c2e61ace33607513770faf115' into froyo-plus-aosp * commit '5f1beda18fc7709c2e61ace33607513770faf115': Make the SSID field of WifiConfiguration consistent with API description.
| * | | | | | | | | | Merge "Make the SSID field of WifiConfiguration consistent with API ↵Chung-yih Wang2010-05-141-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | description." into froyo
| | * | | | | | | | | | Make the SSID field of WifiConfiguration consistent with API description.Chung-yih Wang2010-05-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug id http://b/issue?id=2684571 Change-Id: I809478991ba606252d69ef007339754ab2856416
* | | | | | | | | | | | am aa77de13: Fix issue #2686193: Can\'t move apps to SD cardDianne Hackborn2010-05-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'aa77de1348cbda3d5348b15734ab141cb9c7759c' into froyo-plus-aosp * commit 'aa77de1348cbda3d5348b15734ab141cb9c7759c': Fix issue #2686193: Can't move apps to SD card
| * | | | | | | | | | | Fix issue #2686193: Can't move apps to SD cardDianne Hackborn2010-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icd84d8080d33fb8ce5103a0e726d50f0ec70092e
* | | | | | | | | | | | am d1e9d590: Doc change: add sizes/sums for sdk/ndk/adt packages.Dirk Dougherty2010-05-143-14/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd1e9d590941303c004459f3d798b26f1bf091535' into froyo-plus-aosp * commit 'd1e9d590941303c004459f3d798b26f1bf091535': Doc change: add sizes/sums for sdk/ndk/adt packages.
| * | | | | | | | | | | Doc change: add sizes/sums for sdk/ndk/adt packages.Dirk Dougherty2010-05-143-14/+14
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9385c5b90a8f366764337adf4221fba4d7448568
* | | | | | | | | | | am eb9128f9: Fix sampleTable instantiation, this makes sure that the sample ↵Andreas Huber2010-05-141-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table refers to the custom datasource that caches the metadata to prevent needless seeking. Merge commit 'eb9128f9b0ee660504621381fd96f82d5bf8a3fd' into froyo-plus-aosp * commit 'eb9128f9b0ee660504621381fd96f82d5bf8a3fd': Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
| * | | | | | | | | | Fix sampleTable instantiation, this makes sure that the sample table refers ↵Andreas Huber2010-05-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the custom datasource that caches the metadata to prevent needless seeking. Change-Id: I576178144ffd753b809e1c4ae269ffc3aa34b511 related-to-bug: 2686604 QA-Impact: well, ..., everything related to streaming mpeg4/aac content over http
* | | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-141-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | Change-Id: I0249c6d796b35af9ba08cbccd463a1f5cf779ecd
| * | | | | | | | | | Merge "Only hold a weak pointer on SurfaceComposerClients"Jean-Baptiste Queru2010-05-141-4/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Only hold a weak pointer on SurfaceComposerClientsMatt Fischer2010-04-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each process maintains an array of active SurfaceComposerClient objects, so that they can be reused as new surfaces are parceled across. When a SurfaceComposerClient is disposed, it will remove itself from this list. However, because the list maintains a strong reference on the object, a reference cycle is created, and the client is never deleted. This patch changes the list to maintain weak pointers on the clients instead. Change-Id: I93dc8155fe28b4e350366a3400cdf22a8c77cdd3
* | | | | | | | | | | | am 826c9f77: docs: fix broken link, reduce API info about backup and point ↵Scott Main2010-05-141-17/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to dev guide Merge commit '826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49' into froyo-plus-aosp * commit '826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49': docs: fix broken link, reduce API info about backup and point to dev guide
| * | | | | | | | | | | docs: fix broken link, reduce API info about backup and point to dev guideScott Main2010-05-141-17/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If6470f1753917819e2f73fbba8947f082a26f720
* | | | | | | | | | | | am 60026c3a: Merge "Doc change: adjust compatibility doc." into froyoDirk Dougherty2010-05-141-9/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '60026c3ab0093e6d4cd464061ab9f36d4d041532' into froyo-plus-aosp * commit '60026c3ab0093e6d4cd464061ab9f36d4d041532': Doc change: adjust compatibility doc.
| * | | | | | | | | | | Merge "Doc change: adjust compatibility doc." into froyoDirk Dougherty2010-05-141-9/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Doc change: adjust compatibility doc.Dirk Dougherty2010-05-141-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I74f9fba81de4d358ecccfe1ef0c69f0e83e1a7c5
* | | | | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38
| * | | | | | | | | | | | Merge "SetLocaleByCarrier, only if its not an unknown carrier."Jean-Baptiste Queru2010-05-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | SetLocaleByCarrier, only if its not an unknown carrier.Jey2010-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia218b3622a23cc0fc1bb2c1606c832ecc561d5bf
* | | | | | | | | | | | | | am 59cfe713: Merge "Doc change: adjustments to the api changes description" ↵Dirk Dougherty2010-05-141-17/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit '59cfe7137ca411bdbb5ffcdf418eecc55d65d09e' into froyo-plus-aosp * commit '59cfe7137ca411bdbb5ffcdf418eecc55d65d09e': Doc change: adjustments to the api changes description
| * | | | | | | | | | | | | Merge "Doc change: adjustments to the api changes description" into froyoDirk Dougherty2010-05-141-17/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Doc change: adjustments to the api changes descriptionDirk Dougherty2010-05-141-17/+12
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9373b424ae008face124e38a163c980608c2e4df
* | | | | | | | | | | | | | am bba70cdb: Merge "Doc change: add note about future instruction set ↵Dirk Dougherty2010-05-141-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support." into froyo Merge commit 'bba70cdba284c3d76cab9843e44097d664882938' into froyo-plus-aosp * commit 'bba70cdba284c3d76cab9843e44097d664882938': Doc change: add note about future instruction set support.
| * | | | | | | | | | | | | Merge "Doc change: add note about future instruction set support." into froyoDirk Dougherty2010-05-141-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Doc change: add note about future instruction set support.Dirk Dougherty2010-05-141-2/+8
| | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If954c1020301f5935c8d9328a531afdddbdad8db
* | | | | | | | | | | | | | am 89969d4c: Merge "Doc change: documentation for library projects in sdk." ↵Dirk Dougherty2010-05-145-20/+811
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit '89969d4cdaf7abbbf6d3fce86c274e7b79113e8d' into froyo-plus-aosp * commit '89969d4cdaf7abbbf6d3fce86c274e7b79113e8d': Doc change: documentation for library projects in sdk.
| * | | | | | | | | | | | | Merge "Doc change: documentation for library projects in sdk." into froyoDirk Dougherty2010-05-145-20/+811
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Doc change: documentation for library projects in sdk.Dirk Dougherty2010-05-145-20/+811
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I615d24a046ba2858676e985072563cc90a906551
* | | | | | | | | | | | | | | am b83a283a: docs: add dev guide for backupScott Main2010-05-144-16/+791
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b83a283ac178ab0a72f1d811189d79b26097835e' into froyo-plus-aosp * commit 'b83a283ac178ab0a72f1d811189d79b26097835e': docs: add dev guide for backup
| * | | | | | | | | | | | | | docs: add dev guide for backupScott Main2010-05-144-16/+791
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I168f6b15d3441c9cbea2cd9699612476c7244530
* | | | | | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4
| * | | | | | | | | | | | | Merge "Accept media files by file extension in case insensitive manner."Jean-Baptiste Queru2010-05-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Accept media files by file extension in case insensitive manner.Atsushi Eno2010-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8e246010c96802ae87960797607fc8f8f2ab6031
* | | | | | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226
| * | | | | | | | | | | | | Merge "Put the wifi status icon in the right place."Joe Onorato2010-05-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Put the wifi status icon in the right place.Steve Kondik2010-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the inconsistency where all network-related icons appear on the right side of the volume/vibrate icon except for the wifi icon, which appears on the left. Thanks to Kevin Purdy @ Lifehacker for kicking my OCD in :)
| * | | | | | | | | | | | | | Merge "Corrected debug message in WindowManager"Dianne Hackborn2010-05-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Corrected debug message in WindowManagerJohan Alfven2010-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When WindowManager reports "Key dispatching timed out" it prints out information about the window state that was present at the time the key was sent to that window. There is a minor error in the class representing the recorded window state so that the currently focused window is printed instead of the recorded focused window. Change-Id: I29a5471ef725e30f812ffd57fd4597ce81c0c7f2
* | | | | | | | | | | | | | | | am fb473bb6: Merge "Doc change: adjustments for ndk feature description" ↵Dirk Dougherty2010-05-131-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60' into froyo-plus-aosp * commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60': Doc change: adjustments for ndk feature description
| * | | | | | | | | | | | | | | Merge "Doc change: adjustments for ndk feature description" into froyoDirk Dougherty2010-05-131-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Doc change: adjustments for ndk feature descriptionDirk Dougherty2010-05-131-3/+4
| | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3eb35c3d5ad756b7fa71c256b531f262e7940d90
* | | | | | | | | | | | | | | | am a0711e7b: Doc change: Add compatibility article.Dirk Dougherty2010-05-133-34/+294
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99' into froyo-plus-aosp * commit 'a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99': Doc change: Add compatibility article.
| * | | | | | | | | | | | | | | Doc change: Add compatibility article.Dirk Dougherty2010-05-133-34/+294
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie6671813eb88bc8cb92575726f8fcf69eb558d08
* | | | | | | | | | | | | | | am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling ↵Suchi Amalapurapu2010-05-132-3/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | packages." into froyo Merge commit 'c928a11e34678296511d5ea34582292be7368618' into froyo-plus-aosp * commit 'c928a11e34678296511d5ea34582292be7368618': Fix 2672155
| * | | | | | | | | | | | | | Merge "Fix 2672155 Check the code path when enabling disabling packages." ↵Suchi Amalapurapu2010-05-132-3/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo
| | * | | | | | | | | | | | | | Fix 2672155Suchi Amalapurapu2010-05-132-3/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check the code path when enabling disabling packages. Add unit test Change-Id: I0f0f482a3735234eab3f63ba1f6462574b70144e
* | | | | | | | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-134-2/+298
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8