Commit Graph

4875 Commits

Author SHA1 Message Date
Mathias Agopian
a5b02e0b4d add a debug property to disable h/w composition. debug.sf.hw, when set to 0 will disable h/w composition 2009-09-09 19:20:10 -07:00
Android (Google) Code Review
6ef94ce674 Merge change 24473 into eclair
* changes:
  fix [2074427] SurfaceView doesn't disappear on GONE
2009-09-09 22:17:45 -04:00
Dmitri Plotnikov
8554888db2 am 0d134509: Merge change 24468 into eclair
Merge commit '0d134509f4f7b05776542996f54c4d306e66dbec' into eclair-plus-aosp

* commit '0d134509f4f7b05776542996f54c4d306e66dbec':
  Increasing uninterrupted sleep quantum in SQLiteDatabase to increase transaction size.
2009-09-09 19:11:50 -07:00
Tammo Spalink
3f7808c536 am d0f02a4d: Merge change 24138 into eclair
Merge commit 'd0f02a4da1413743c90a51426bc3221bfa6ff342' into eclair-plus-aosp

* commit 'd0f02a4da1413743c90a51426bc3221bfa6ff342':
  Do not die when printing empty prefs.
2009-09-09 19:11:45 -07:00
Amith Yamasani
09051c6619 am 67af9f5b: Merge change 24471 into eclair
Merge commit '67af9f5bf1abdaeedbdf21c1de9502d33de8f16f' into eclair-plus-aosp

* commit '67af9f5bf1abdaeedbdf21c1de9502d33de8f16f':
  Fixed the fastscroll thumb asset in hdpi.
2009-09-09 19:11:40 -07:00
Android (Google) Code Review
b5791ee800 Merge change 24468 into eclair
* changes:
  Increasing uninterrupted sleep quantum in SQLiteDatabase to increase transaction size.
2009-09-09 22:06:48 -04:00
Android (Google) Code Review
f14259067d Merge change 24138 into eclair
* changes:
  Do not die when printing empty prefs.
2009-09-09 21:36:48 -04:00
Android (Google) Code Review
dbf0daba8f Merge change 24471 into eclair
* changes:
  Fixed the fastscroll thumb asset in hdpi.
2009-09-09 21:31:07 -04:00
Grace Kloba
36c3e91f36 am 9ca7d0c2: Merge change 24460 into eclair
Merge commit '9ca7d0c2efe76798e0963fd0b27a7224e9819171' into eclair-plus-aosp

* commit '9ca7d0c2efe76798e0963fd0b27a7224e9819171':
  The empty path and no path mean default path. So "a=d" should replace "a=c".
2009-09-09 18:30:15 -07:00
Android (Google) Code Review
8a56b38540 Merge change 24460 into eclair
* changes:
  The empty path and no path mean default path. So "a=d" should replace "a=c".
2009-09-09 21:23:46 -04:00
Mathias Agopian
671ea3512c am b33f92dd: Merge change 24465 into eclair
Merge commit 'b33f92dd5666134782a06b191a9025544711f85b' into eclair-plus-aosp

* commit 'b33f92dd5666134782a06b191a9025544711f85b':
  fix [2102410] Home Screen is not displayed in the background in Landscape Mode
2009-09-09 17:56:40 -07:00
Scott Main
ff4127f02a am 0c910494: am aa4511cf: docs only. revise ADC2 announcement
Merge commit '0c91049482cd9467a29c2387766cfcef371d859c' into eclair-plus-aosp

* commit '0c91049482cd9467a29c2387766cfcef371d859c':
  docs only.
2009-09-09 17:52:13 -07:00
Jeff Sharkey
96f2907beb am f46a9cf3: API to combine LOOKUP_KEY and Contacts._ID together.
Merge commit 'f46a9cf38207d03730c04d02cf40aa3859cd9ad3' into eclair-plus-aosp

* commit 'f46a9cf38207d03730c04d02cf40aa3859cd9ad3':
  API to combine LOOKUP_KEY and Contacts._ID together.
2009-09-09 17:52:08 -07:00
Android (Google) Code Review
11a68fdf07 Merge change 24465 into eclair
* changes:
  fix [2102410] Home Screen is not displayed in the background in Landscape Mode
2009-09-09 20:52:03 -04:00
Mathias Agopian
b6a5daa3ab fix [2102410] Home Screen is not displayed in the background in Landscape Mode
the blurring code now handles NPOT textures.
2009-09-09 17:47:15 -07:00
Scott Main
a9a9c8eb76 am aa4511cf: docs only. revise ADC2 announcement
Merge commit 'aa4511cfcde8edfb3e63fd6127ad6f3102c69369' into eclair

* commit 'aa4511cfcde8edfb3e63fd6127ad6f3102c69369':
  docs only.
2009-09-09 17:46:50 -07:00
James Stokebrand
80d13a5b93 am 16b72bbb: Merge change 24391 into eclair
Merge commit '16b72bbbc985cba7c59f52bf6969b4015f185830' into eclair-plus-aosp

* commit '16b72bbbc985cba7c59f52bf6969b4015f185830':
  RIO-7461: Update media scanner to scan AAC files.
2009-09-09 14:50:19 -07:00
Android (Google) Code Review
4aeb7e9af2 Merge change 24391 into eclair
* changes:
  RIO-7461: Update media scanner to scan AAC files. (Change in frameworks/base git)
2009-09-09 17:42:32 -04:00
Tom Taylor
9b8b231d7c am 1048ad55: Merge change 24395 into eclair
Merge commit '1048ad554ac64224c864f52266b5839cd91d4ee5' into eclair-plus-aosp

* commit '1048ad554ac64224c864f52266b5839cd91d4ee5':
  Make NumberPicker subclassable
2009-09-09 14:30:47 -07:00
Chia-chi Yeh
5049ca04da am 7dcf5c7b: Merge change 24426 into eclair
Merge commit '7dcf5c7ba82437fe197354f7d0585de20a382e4d' into eclair-plus-aosp

* commit '7dcf5c7ba82437fe197354f7d0585de20a382e4d':
  keystore: remove "#include <openssl/engine.h>".
2009-09-09 14:30:42 -07:00
Android (Google) Code Review
00bcf5ee27 Merge change 24395 into eclair
* changes:
  Make NumberPicker subclassable
2009-09-09 17:24:51 -04:00
Android (Google) Code Review
ebdf3a2d94 Merge change 24426 into eclair
* changes:
  keystore: remove "#include <openssl/engine.h>".
2009-09-09 17:04:44 -04:00
Grace Kloba
f28ef592aa am d82bc515: Avoid the rounding error, as Math.round(Math.round(viewWidth * mInvActualScale) * mActualScale) not necessary to be viewWidth, we special case when the content exactly fit in the view case.
Merge commit 'd82bc5158c764bdd30b7d22f32258ad3c2c0c0f6' into eclair-plus-aosp

* commit 'd82bc5158c764bdd30b7d22f32258ad3c2c0c0f6':
  Avoid the rounding error, as Math.round(Math.round(viewWidth * mInvActualScale) * mActualScale) not necessary to be viewWidth, we special case when the content exactly fit in the view case.
2009-09-09 14:02:05 -07:00
Leon Scroggins
a382afebc6 am f416264a: Merge change 24398 into eclair
Merge commit 'f416264a3b13c5965bfe1c75e9fb2a480d556f87' into eclair-plus-aosp

* commit 'f416264a3b13c5965bfe1c75e9fb2a480d556f87':
  Adjust the WebTextView's text size according to density.
2009-09-09 14:02:01 -07:00
Android (Google) Code Review
ac997bd50f Merge change 24398 into eclair
* changes:
  Adjust the WebTextView's text size according to density.
2009-09-09 16:22:16 -04:00
Romain Guy
8674c7a6f2 am d380586a: Merge change 24413 into eclair
Merge commit 'd380586ac19903145e23ad3a8d073f01b4fe1192' into eclair-plus-aosp

* commit 'd380586ac19903145e23ad3a8d073f01b4fe1192':
  Remove the FallRS demo, now promoted as a wallpaper.
2009-09-09 13:19:49 -07:00
Android (Google) Code Review
a68c9b8ec2 Merge change 24413 into eclair
* changes:
  Remove the FallRS demo, now promoted as a wallpaper.
2009-09-09 16:11:30 -04:00
Nick Pelly
31c4b1b713 am 41140098: Merge change 24274 into eclair
Merge commit '411400980720895c4195c71e181831bc771a5a7b' into eclair-plus-aosp

* commit '411400980720895c4195c71e181831bc771a5a7b':
  API_CHANGE
2009-09-09 11:39:22 -07:00
Nick Pelly
445330bb04 am aadc9220: Merge change 24202 into eclair
Merge commit 'aadc9220bd04ba8dd016fe634fabf6c91a1ce672' into eclair-plus-aosp

* commit 'aadc9220bd04ba8dd016fe634fabf6c91a1ce672':
  API_CHANGE
2009-09-09 11:39:16 -07:00
Android (Google) Code Review
7863838310 Merge change 24274 into eclair
* changes:
  API_CHANGE
2009-09-09 14:34:44 -04:00
Android (Google) Code Review
62bfa41b3d Merge change 24202 into eclair
* changes:
  API_CHANGE
2009-09-09 14:30:15 -04:00
Andreas Huber
709cec1e02 am 201511cf: Calculate proper output buffer size for some more 16-bit RGB color spaces.
Merge commit '201511cf8a004d386ec9f592041ad3e3d4107184' into eclair-plus-aosp

* commit '201511cf8a004d386ec9f592041ad3e3d4107184':
  Calculate proper output buffer size for some more 16-bit RGB color spaces.
2009-09-09 11:29:43 -07:00
Andreas Huber
919374a7a0 am 5a65a6e2: Added a .amr file extractor (for AMR-NB and AMR-WB content).
Merge commit '5a65a6e22017e51ebcebb0f41510c54f1085f82c' into eclair-plus-aosp

* commit '5a65a6e22017e51ebcebb0f41510c54f1085f82c':
  Added a .amr file extractor (for AMR-NB and AMR-WB content).
2009-09-09 11:25:11 -07:00
Andreas Huber
0c33f5022e am 4e60d7e6: Merge change 24179 into eclair
Merge commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c' into eclair-plus-aosp

* commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c':
  Support encoding amr-wb content in stagefright.
2009-09-09 11:02:33 -07:00
Android (Google) Code Review
d838e6e18a Merge change 24179 into eclair
* changes:
  Support encoding amr-wb content in stagefright.
2009-09-09 13:55:48 -04:00
Jaikumar Ganesh
33c102bf6f am 100f0861: Merge change 24376 into eclair
Merge commit '100f08613392c225b8dff3f1e1d586f981884e29' into eclair-plus-aosp

* commit '100f08613392c225b8dff3f1e1d586f981884e29':
  Query for all properties if a property change is received and cache is empty.
2009-09-09 10:55:14 -07:00
Android (Google) Code Review
bbc2ce25ef Merge change 24376 into eclair
* changes:
  Query for all properties if a property change is received and cache is empty.
2009-09-09 13:47:27 -04:00
Andrei Popescu
d6ca68dd40 am cf7b5521: Remove the call to nativeAddJavascriptInterface() from BrowserFrame::addJavascriptInterface() as it causes an intermitent crash.
Merge commit 'cf7b5521fc4a8f87033e3bf3626e8a2cf81fccfd' into eclair-plus-aosp

* commit 'cf7b5521fc4a8f87033e3bf3626e8a2cf81fccfd':
  Remove the call to nativeAddJavascriptInterface() from BrowserFrame::addJavascriptInterface() as it causes an intermitent crash.
2009-09-09 10:16:18 -07:00
Grace Kloba
30814a5ea4 am ccda4c49: Merge change 24288 into eclair
Merge commit 'ccda4c4960ad6694e506e075f8f0b479ea2bafb6' into eclair-plus-aosp

* commit 'ccda4c4960ad6694e506e075f8f0b479ea2bafb6':
  Do not cache POST response as Cache is indexed with url.
2009-09-09 09:00:07 -07:00
Android (Google) Code Review
4460e66487 Merge change 24288 into eclair
* changes:
  Do not cache POST response as Cache is indexed with url.
2009-09-09 11:55:03 -04:00
Andy McFadden
97fefb45df am b9e52a07: Fix sim-eng build.
Merge commit 'b9e52a07b7a605fe6d6588587bc74002f632c768' into eclair-plus-aosp

* commit 'b9e52a07b7a605fe6d6588587bc74002f632c768':
  Fix sim-eng build.
2009-09-09 08:47:04 -07:00
Andy McFadden
e0a963b72e Fix sim-eng build.
Appears to have been broken by:

commit 9779b221e999583ff89e0dfc40e56398737adbb3
Author: Mathias Agopian <mathias@google.com>
Date:   Mon Sep 7 16:32:45 2009 -0700

    fix [2068105] implement queueBuffer/lockBuffer/dequeueBuffer properly

For some reason we don't like to have "-lpthread" globally -- it's a no-op
on device builds, but required for many host tools and all sim binaries --
so adding the use of pthread calls requires adding the library explicitly.
2009-09-09 08:02:54 -07:00
Eric Laurent
6ad8c64ce9 Fix issue 2107584: media server crash when AudioFlinger fails to allocate memory for track control block.
AudioFlinger: verify that mCblk is not null before using it in Track and RecordTrack contructors.
IAudioFlinger: check result of remote transaction before reading IAudioTrack and IAudioRecord.
IAudioTrack and IAudioRecord: check result of remote transaction before reading IMemory.
2009-09-09 05:16:08 -07:00
Mathias Agopian
c8e87684d1 am 11c803ac: Merge change 24335 into eclair
Merge commit '11c803ac77b6a9b815180b4649a700361d3b8cfe' into eclair-plus-aosp

* commit '11c803ac77b6a9b815180b4649a700361d3b8cfe':
  use broadcast() instead of signal() when signaling the condition-variable Thread::RequestExitAndWait() is waiting for
2009-09-09 03:32:09 -07:00
Mathias Agopian
dcbd95b874 am 72e2d6da: Merge change 24334 into eclair
Merge commit '72e2d6da79a2fc3b5346c02ed40b9335c1eb78fa' into eclair-plus-aosp

* commit '72e2d6da79a2fc3b5346c02ed40b9335c1eb78fa':
  fix [2037525] Fail to start camera after adb sync new Camera
2009-09-09 03:32:06 -07:00
Mathias Agopian
674ef96f69 am 0a5bf257: Merge change 24333 into eclair
Merge commit '0a5bf25765cc884aba8d417d8a85f985c5ff3b5a' into eclair-plus-aosp

* commit '0a5bf25765cc884aba8d417d8a85f985c5ff3b5a':
  rename Mutexes to make the code easier to follow
2009-09-09 03:32:02 -07:00
Android (Google) Code Review
1f5105cf53 Merge change 24335 into eclair
* changes:
  use broadcast() instead of signal() when signaling the condition-variable Thread::RequestExitAndWait() is waiting for
2009-09-09 03:29:19 -07:00
Android (Google) Code Review
42c3c9a8d1 Merge change 24334 into eclair
* changes:
  fix [2037525] Fail to start camera after adb sync new Camera
2009-09-09 03:29:08 -07:00
Android (Google) Code Review
0ee8522ffa Merge change 24333 into eclair
* changes:
  rename Mutexes to make the code easier to follow
2009-09-09 03:28:47 -07:00
Mathias Agopian
4de4ebf6a2 use broadcast() instead of signal() when signaling the condition-variable Thread::RequestExitAndWait() is waiting for
we could have several thread waiting on the condition and they all need to wake-up.
also added a debug "mTid" field in the class, which contains the tid of the thread (as opposed to pthread_t), this
is useful when debugging under gdb for instance.
2009-09-09 02:45:26 -07:00