Commit Graph

4616 Commits

Author SHA1 Message Date
San Mehat
b01b3fc50f am 181b31a0: Process: Add support for using scheduler policies instead of cgroups. Preference is given to cgroups if available.
Merge commit '181b31a0d87d525ea64102a965210331e0c6885b' into eclair-plus-aosp

* commit '181b31a0d87d525ea64102a965210331e0c6885b':
  Process: Add support for using scheduler policies instead of cgroups.
2009-09-10 15:42:46 -07:00
Andreas Huber
9c268c7d35 am c06307cc: Merge change 24583 into eclair
Merge commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3' into eclair-plus-aosp

* commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3':
  Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.
2009-09-10 15:42:41 -07:00
San Mehat
9410f98e78 Process: Add support for using scheduler policies instead of cgroups.
Preference is given to cgroups if available.

Signed-off-by: San Mehat <san@google.com>
2009-09-10 15:09:38 -07:00
Android (Google) Code Review
476a3aef5e Merge change 24583 into eclair
* changes:
  Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.
2009-09-10 18:08:08 -04:00
Wink Saville
404beefef7 am 88e3f827: Allow an alternate eri file.
Merge commit '88e3f827e657ef741099b24896c17533fa9ef61e' into eclair-plus-aosp

* commit '88e3f827e657ef741099b24896c17533fa9ef61e':
  Allow an alternate eri file.
2009-09-10 15:00:52 -07:00
Dianne Hackborn
37689cfea9 am e8f0603e: Merge change 24567 into eclair
Merge commit 'e8f0603eb631ecef5f41105711f4afdea8c6d8d8' into eclair-plus-aosp

* commit 'e8f0603eb631ecef5f41105711f4afdea8c6d8d8':
  Fix issue #1943927: need notification in status bar when adb is active
2009-09-10 14:30:53 -07:00
Romain Guy
5faf6ae4dd am 5b61bea7: Merge change 24581 into eclair
Merge commit '5b61bea7aba93fc812991116fbbf9c4dbccb4890' into eclair-plus-aosp

* commit '5b61bea7aba93fc812991116fbbf9c4dbccb4890':
  Dialog titles would sometimes use a font too large.
2009-09-10 14:30:48 -07:00
Android (Google) Code Review
8b0bfdf70a Merge change 24567 into eclair
* changes:
  Fix issue #1943927: need notification in status bar when adb is active
2009-09-10 17:28:57 -04:00
Android (Google) Code Review
dd9edb0686 Merge change 24581 into eclair
* changes:
  Dialog titles would sometimes use a font too large.
2009-09-10 17:26:05 -04:00
Dianne Hackborn
148985efed am bcbcaa7e: Wallpapers, animations, pending intent.
Merge commit 'bcbcaa7edd32ba67c6290d79f7e7821c4b5b39ac' into eclair-plus-aosp

* commit 'bcbcaa7edd32ba67c6290d79f7e7821c4b5b39ac':
  Wallpapers, animations, pending intent.
2009-09-10 13:06:08 -07:00
Mike Reed
d06239ab83 am e1fd0240: Merge change 24551 into eclair
Merge commit 'e1fd02400d69c059db2cc6299c893eba4096cc1d' into eclair-plus-aosp

* commit 'e1fd02400d69c059db2cc6299c893eba4096cc1d':
  default dithering to ON (cheap, looks good)
2009-09-10 13:06:03 -07:00
Dmitri Plotnikov
7a17c28790 am 84b4d37d: [Issue 2099206] Encoding phone number prior to sending it to the phone lookup filter
Merge commit '84b4d37dd1e9269f73c2a9cacadcd88ec4256e3f' into eclair-plus-aosp

* commit '84b4d37dd1e9269f73c2a9cacadcd88ec4256e3f':
  [Issue 2099206] Encoding phone number prior to sending it to the phone lookup filter
2009-09-10 13:05:58 -07:00
Android (Google) Code Review
bc52dabcb0 Merge change 24551 into eclair
* changes:
  default dithering to ON (cheap, looks good) officially ignore filtering (expensive, no real improvement)
2009-09-10 14:53:26 -04:00
Scott Main
20586b2ef2 am e02f4f12: am c2d3fc2c: Merge change 22323 into donut
Merge commit 'e02f4f1274ac166a1d314e44b586c31febaf56a7' into eclair-plus-aosp

* commit 'e02f4f1274ac166a1d314e44b586c31febaf56a7':
  docs only.
2009-09-10 11:46:34 -07:00
Scott Main
2ab5a8f1ba am c2d3fc2c: Merge change 22323 into donut
Merge commit 'c2d3fc2cc1db63e7bb9421878f2959a3936325a9' into eclair

* commit 'c2d3fc2cc1db63e7bb9421878f2959a3936325a9':
  docs only.
2009-09-10 11:40:01 -07:00
Android (Google) Code Review
1381679a78 Merge change 22323 into donut
* changes:
  docs only. add the 1.6 platform highlights
2009-09-10 14:29:59 -04:00
Jim Miller
688e712a69 am dc9555fb: Merge change 24464 into eclair
Merge commit 'dc9555fb64b3fe53a06e7eabbf4a31018b9ee1ac' into eclair-plus-aosp

* commit 'dc9555fb64b3fe53a06e7eabbf4a31018b9ee1ac':
  Fix for bug # 2023074: settings db updater broken at version 34.
2009-09-10 11:18:56 -07:00
Andreas Huber
91a7acdae5 am d9ca6a79: Merge change 24530 into eclair
Merge commit 'd9ca6a79c6ac9cc8790aabbb42fe2ce579001528' into eclair-plus-aosp

* commit 'd9ca6a79c6ac9cc8790aabbb42fe2ce579001528':
  Add component name to informational logging in OMXCodec.cpp
2009-09-10 11:18:52 -07:00
Android (Google) Code Review
7f4a4b5d84 Merge change 24464 into eclair
* changes:
  Fix for bug # 2023074: settings db updater broken at version 34.
2009-09-10 14:09:54 -04:00
Android (Google) Code Review
166458f780 Merge change 24530 into eclair
* changes:
  Add component name to informational logging in OMXCodec.cpp
2009-09-10 13:27:50 -04:00
Lixin Yue
3135d238bd am 2d3f9c55: Add timestamp support for call history vcard
Merge commit '2d3f9c559366ede6aefe9bcff554ef9c4eac21dd' into eclair-plus-aosp

* commit '2d3f9c559366ede6aefe9bcff554ef9c4eac21dd':
  Add timestamp support for call history vcard
2009-09-10 10:22:08 -07:00
Andreas Huber
2b8efa7ebf am 466dbbfd: Merge change 24450 into eclair
Merge commit '466dbbfd4595d714127a4bc92dd9235807b88be6' into eclair-plus-aosp

* commit '466dbbfd4595d714127a4bc92dd9235807b88be6':
  Minor API change in MPEG4Writer, support for amr output into MPEG4 containers.
2009-09-10 09:44:54 -07:00
Andreas Huber
378bc6aef8 am 546f3cd5: Merge change 24448 into eclair
Merge commit '546f3cd579b80299307d82a769aca8e8f68484ec' into eclair-plus-aosp

* commit '546f3cd579b80299307d82a769aca8e8f68484ec':
  Support for amr-wb tracks in MPEG4Extractor.
2009-09-10 09:44:49 -07:00
Andreas Huber
5f47a46ab3 am 18ed7601: Merge change 24447 into eclair
Merge commit '18ed7601d2b5d9c3e1c610fb77499900f0c74993' into eclair-plus-aosp

* commit '18ed7601d2b5d9c3e1c610fb77499900f0c74993':
  Added some more verbose output for AMR formats. Properly fill out the output format.
2009-09-10 09:44:44 -07:00
Android (Google) Code Review
d1067841dc Merge change 24450 into eclair
* changes:
  Minor API change in MPEG4Writer, support for amr output into MPEG4 containers.
2009-09-10 12:39:26 -04:00
Android (Google) Code Review
6e963bd166 Merge change 24448 into eclair
* changes:
  Support for amr-wb tracks in MPEG4Extractor.
2009-09-10 12:39:16 -04:00
Android (Google) Code Review
921b1c70c2 Merge change 24447 into eclair
* changes:
  Added some more verbose output for AMR formats. Properly fill out the output format.
2009-09-10 12:39:08 -04:00
Mike Lockwood
4bfd46b10b am 68f6f01c: Merge change 24527 into eclair
Merge commit '68f6f01cf62e0c282b570adf492352a5d4418584' into eclair-plus-aosp

* commit '68f6f01cf62e0c282b570adf492352a5d4418584':
  MountService: Use correct icon for SD card notifications.
2009-09-10 09:25:35 -07:00
Android (Google) Code Review
160c7df55d Merge change 24527 into eclair
* changes:
  MountService: Use correct icon for SD card notifications.
2009-09-10 12:20:49 -04:00
Snigdha Sinha
325e74c4c0 am 65736718: Merge change 24283 into eclair
Merge commit '657367185652f9877eb232b84e16fbed0d759f87' into eclair-plus-aosp

* commit '657367185652f9877eb232b84e16fbed0d759f87':
  CameraService change for OVERLAY_FORMAT_DEFAULT
2009-09-10 08:35:00 -07:00
Android (Google) Code Review
1de162ddb2 Merge change 24283 into eclair
* changes:
  CameraService change for OVERLAY_FORMAT_DEFAULT
2009-09-10 11:28:20 -04:00
Eric Laurent
fec5aefcd9 am f63e3f3c: Merge change 24512 into eclair
Merge commit 'f63e3f3cc8c61bc9eeda980f314795412eb03b79' into eclair-plus-aosp

* commit 'f63e3f3cc8c61bc9eeda980f314795412eb03b79':
  Fix issue android.permission.cts.NoAudioPermissionTest:testRouting is failing.
2009-09-10 08:17:19 -07:00
Daisuke Miyakawa
44cd493ef8 am df4edc80: Merge change 24499 into eclair
Merge commit 'df4edc807ca32419118a9b86a3d68b0fac02f5fa' into eclair-plus-aosp

* commit 'df4edc807ca32419118a9b86a3d68b0fac02f5fa':
  Modify android.syncml.pim so that no one is going to use.
2009-09-10 08:17:15 -07:00
Android (Google) Code Review
13a6dc41bd Merge change 24512 into eclair
* changes:
  Fix issue android.permission.cts.NoAudioPermissionTest:testRouting is failing.
2009-09-10 11:12:03 -04:00
Android (Google) Code Review
d5ea5ca44d Merge change 24499 into eclair
* changes:
  Modify android.syncml.pim so that no one is going to use.
2009-09-10 04:22:09 -04:00
Hung-ying Tyan
fe1898ce40 am 57fc4114: Merge change 24132 into eclair
Merge commit '57fc41143d9c855b9a04f4d5f0a21bb99298d67d' into eclair-plus-aosp

* commit '57fc41143d9c855b9a04f4d5f0a21bb99298d67d':
  Add two CertTool helper classes.
2009-09-10 01:21:34 -07:00
Android (Google) Code Review
4c77a0c64b Merge change 24132 into eclair
* changes:
  Add two CertTool helper classes.
2009-09-10 04:16:56 -04:00
Tammo Spalink
2694aabe83 am a8cdbc85: Merge change 24501 into eclair
Merge commit 'a8cdbc85c003eae8c1b7178fcd70f8bc711aed96' into eclair-plus-aosp

* commit 'a8cdbc85c003eae8c1b7178fcd70f8bc711aed96':
  Make Phone.updateServiceLocation acquire a one-shot wake lock.
2009-09-10 00:45:07 -07:00
Android (Google) Code Review
0deeb62b07 Merge change 24501 into eclair
* changes:
  Make Phone.updateServiceLocation acquire a one-shot wake lock.
2009-09-10 03:40:54 -04:00
Jeff Sharkey
7c9ef309bf am 6ba23c59: Handle cases where TYPE can be undefined, such as EAS.
Merge commit '6ba23c59f24b443cd21c6289fa0aac3df8f17017' into eclair-plus-aosp

* commit '6ba23c59f24b443cd21c6289fa0aac3df8f17017':
  Handle cases where TYPE can be undefined, such as EAS.
2009-09-09 23:14:39 -07:00
Mathias Agopian
7f05c7ae32 am 24d237db: add a debug property to disable h/w composition. debug.sf.hw, when set to 0 will disable h/w composition
Merge commit '24d237db943051942b5966f5e788d67050ec0ba5' into eclair-plus-aosp

* commit '24d237db943051942b5966f5e788d67050ec0ba5':
  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:25:53 -07:00
Mathias Agopian
390bd32c88 am bbe14a17: Merge change 24473 into eclair
Merge commit 'bbe14a1758a5b99689b7aa13a6d4f58e61705ebf' into eclair-plus-aosp

* commit 'bbe14a1758a5b99689b7aa13a6d4f58e61705ebf':
  fix [2074427] SurfaceView doesn't disappear on GONE
2009-09-09 19:25:49 -07:00
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