Commit Graph

1839 Commits

Author SHA1 Message Date
Feng Qian
8265ea9cd0 Merge commit 'goog/master-webkit-merge' into webkit-merge-44544 2009-06-18 17:52:33 -07:00
Android (Google) Code Review
7a41775145 Merge change 4698
* changes:
  Fix bug in BluetoothInputStream.read().
2009-06-18 17:42:25 -07:00
Android (Google) Code Review
4cac335522 am 2810f681: Merge change 4694 into donut
Merge commit '2810f681991d1beb5ceb3515159f9fad3cc341d5'

* commit '2810f681991d1beb5ceb3515159f9fad3cc341d5':
  Make SettingsProviders SecurityException messages more verbose.
2009-06-18 17:26:48 -07:00
Android (Google) Code Review
fa1cf39b80 Merge change 4694 into donut
* changes:
  Make SettingsProviders SecurityException messages more verbose.
2009-06-18 17:24:47 -07:00
Android (Google) Code Review
f7107cd453 Merge change 4692
* changes:
  Replace spins with proper pthread conditions.
2009-06-18 17:21:31 -07:00
Android (Google) Code Review
714a47ed6d am 167dbe0b: Merge change 4670 into donut
Merge commit '167dbe0bf1f8d807d1ced400f146b7780eb6c721'

* commit '167dbe0bf1f8d807d1ced400f146b7780eb6c721':
  Update RandomBlock to use RandomAccessFile.  This helps
2009-06-18 17:07:29 -07:00
Android (Google) Code Review
7fb5324d3f Merge change 4670 into donut
* changes:
  Update RandomBlock to use RandomAccessFile.  This helps prevent certain unusual conditions from corrupting the entropy file.  (for example, if Android should happen to crash while a write is in progress)
2009-06-18 17:05:19 -07:00
Android (Google) Code Review
d538291517 am 0bceb77b: Merge change 4669 into donut
Merge commit '0bceb77b004a688ca044b794e0622385c6e2953d'

* commit '0bceb77b004a688ca044b794e0622385c6e2953d':
  Fixes #1922373. Resolves a case of keys collision in Resources' cache.
2009-06-18 17:03:10 -07:00
Android (Google) Code Review
7142c41383 Merge change 4669 into donut
* changes:
  Fixes #1922373. Resolves a case of keys collision in Resources' cache.
2009-06-18 17:01:37 -07:00
Android (Google) Code Review
01e43f2fb4 am 07eac016: Merge change 4682 into donut
Merge commit '07eac016446c63711bebe6e553e98c02d1fe55a5'

* commit '07eac016446c63711bebe6e553e98c02d1fe55a5':
  Store the app signatures as part of the backup set
2009-06-18 16:17:12 -07:00
Android (Google) Code Review
ccd7a82af8 Merge change 4682 into donut
* changes:
  Store the app signatures as part of the backup set
2009-06-18 16:15:47 -07:00
Android (Google) Code Review
614a1f97df am c9dc19bb: Merge change 4668 into donut
Merge commit 'c9dc19bb96d2d77ec50f6e40fc22d1ff615f2044'

* commit 'c9dc19bb96d2d77ec50f6e40fc22d1ff615f2044':
  Fix runtime restarts due to sending the wrong flags to dbus.
2009-06-18 15:43:34 -07:00
Android (Google) Code Review
e2095d0a1c am b1cdb648: Merge change 4565 into donut
Merge commit 'b1cdb64877ebd3b8c5182913ff02edd8b54a6982'

* commit 'b1cdb64877ebd3b8c5182913ff02edd8b54a6982':
  Allow the qemu.sf.lcd_density property to override the value of ro.sf.lcd_density
2009-06-18 15:43:28 -07:00
Android (Google) Code Review
10a91f90bf Merge change 4668 into donut
* changes:
  Fix runtime restarts due to sending the wrong flags to dbus.
2009-06-18 15:42:00 -07:00
Android (Google) Code Review
bcb14286cc Merge change 4565 into donut
* changes:
  Allow the qemu.sf.lcd_density property to override the value of ro.sf.lcd_density
2009-06-18 15:41:34 -07:00
David 'Digit' Turner
694e10ba87 Allow the qemu.sf.lcd_density property to override the value of ro.sf.lcd_density
ro.sf.lcd_density is usually defined in the build.prop file which is parsed by init
before anything else. Since its name begins with "ro.", this property is write-once
and cannot later be modified, e.g. in /system/etc/init.goldfish.sh.

In other words, you cannot use "emulator -prop ro.sf.lcd_density=<value>", since
it is impossible to override the value defined in build.prop

This patch modifies the system to recognize "qemu.sf.lcd_density" as an override
value, which can be set with "emulator -prop qemu.sf.lcd_density=<value>", forcing
a specific density.

A later patch will allow the emulator to automatically set this property depending
on AVD hardware configuration settings.
2009-06-19 00:17:31 +02:00
Android (Google) Code Review
b041606d8f Merge change 4666
* changes:
  Another javadoc attempted fix.
2009-06-18 15:13:06 -07:00
Android (Google) Code Review
96a04d3e2a am 7153739a: Merge change 4661 into donut
Merge commit '7153739a92dda971fd865defae0747bec921d8af'

* commit '7153739a92dda971fd865defae0747bec921d8af':
  Grouping under TextToSpeech.Engine the constants to be used by
2009-06-18 15:08:47 -07:00
Android (Google) Code Review
0491cda63b Merge change 4661 into donut
* changes:
  Grouping under TextToSpeech.Engine the constants to be used by a TTS engine implementation or a settings application for default values, and data integrity check return codes.
2009-06-18 15:07:00 -07:00
Android (Google) Code Review
1e92eab390 Merge change 4662
* changes:
  Truly fix the build (I hope).
2009-06-18 14:46:28 -07:00
Android (Google) Code Review
0a48a00621 am 8696d703: Merge change 3874 into donut
Merge commit '8696d7030af6f0d58859f1027c423143b67f9fb4'

* commit '8696d7030af6f0d58859f1027c423143b67f9fb4':
  for cdma concatenated (long) messages, replace ascii7bit with gsm7bit encoding
2009-06-18 13:56:41 -07:00
Android (Google) Code Review
1c562e45ed Merge change 4629
* changes:
  Alter the HISTORY_PROJECTION and BookmarkColumns.
2009-06-18 13:53:17 -07:00
Android (Google) Code Review
454c2b9835 Merge change 3874 into donut
* changes:
  for cdma concatenated (long) messages, replace ascii7bit with gsm7bit encoding
2009-06-18 13:45:19 -07:00
Android (Google) Code Review
5b89329211 am 77dcf735: Merge change 4561 into donut
Merge commit '77dcf735ff3115ef20244408313823d489d88143'

* commit '77dcf735ff3115ef20244408313823d489d88143':
  Work around the Czech lack of abbreviated month names.
2009-06-18 12:23:23 -07:00
Android (Google) Code Review
7b3dbb9626 Merge change 4561 into donut
* changes:
  Work around the Czech lack of abbreviated month names.
2009-06-18 12:20:50 -07:00
Android (Google) Code Review
33969aee5e am 47a67ebc: Merge change 4544 into donut
Merge commit '47a67ebcf2d772d5dcae459caa57125b3fe733b3'

* commit '47a67ebcf2d772d5dcae459caa57125b3fe733b3':
  Connect TabHost/TabWidget/FrameLayout in the layout editor.
2009-06-18 12:09:15 -07:00
Android (Google) Code Review
2d9c3fb982 Merge change 4544 into donut
* changes:
  Connect TabHost/TabWidget/FrameLayout in the layout editor.
2009-06-18 12:06:59 -07:00
Android (Google) Code Review
2979348e6a am 5ad76ef5: Merge change 4521 into donut
Merge commit '5ad76ef5ee1b437b4c07ed0be78ec7cc16c81dfe'

* commit '5ad76ef5ee1b437b4c07ed0be78ec7cc16c81dfe':
  load entropy data at boot.  Periodically write entropy data to disk.
2009-06-18 12:00:41 -07:00
Android (Google) Code Review
de0503176c Merge change 4521 into donut
* changes:
  load entropy data at boot.  Periodically write entropy data to disk.
2009-06-18 11:58:54 -07:00
Mike LeBeau
6972c0c780 am df1ff2cb: Use a full-screen-width version of the in-app search dropdown with rounded corners. We may decide to use this for global search too, I\'ll try that out in a bit.
Merge commit 'df1ff2cb332ad2d819671f1e78e5bd68d758ca54'

* commit 'df1ff2cb332ad2d819671f1e78e5bd68d758ca54':
  Use a full-screen-width version of the in-app search dropdown with
2009-06-18 11:09:14 -07:00
Mike LeBeau
44fbb4f604 am 0b1ff191: Icons for create a contact and call contact suggestions, to be used by all contacts providers.
Merge commit '0b1ff191cd94a450c01e0ce5139ca08af0677dd6'

* commit '0b1ff191cd94a450c01e0ce5139ca08af0677dd6':
  Icons for create a contact and call contact suggestions, to be used by all
2009-06-18 10:57:34 -07:00
Mike LeBeau
4c3b1cf846 am cce7dbc3: Re-enable query jamming.
Merge commit 'cce7dbc31ed100b39c3e1174dd3d9a01de648e5b'

* commit 'cce7dbc31ed100b39c3e1174dd3d9a01de648e5b':
  Re-enable query jamming.
2009-06-18 10:57:30 -07:00
Feng Qian
6b48f33533 Merge commit 'goog/master' into webkit_merge 2009-06-18 10:33:04 -07:00
Android (Google) Code Review
f3fede94e7 am e748161c: Merge change 4529 into donut
Merge commit 'e748161ca89867e8c57d4e71c780486d4de8039c'

* commit 'e748161ca89867e8c57d4e71c780486d4de8039c':
  In the TTS service, read the default TTS settings from Settings.Secure.
2009-06-18 08:56:19 -07:00
Android (Google) Code Review
1eb941b86b Merge change 4529 into donut
* changes:
  In the TTS service, read the default TTS settings from Settings.Secure.
2009-06-18 08:53:58 -07:00
Android (Google) Code Review
8c4743dfa9 am 36c153f8: Merge change 4535 into donut
Merge commit '36c153f84f2728ffc67b7f30a1f326a7731c2088'

* commit '36c153f84f2728ffc67b7f30a1f326a7731c2088':
  Add title to nested preference screens.
2009-06-18 07:13:49 -07:00
Android (Google) Code Review
032b6aa667 Merge change 4535 into donut
* changes:
  Add title to nested preference screens.
2009-06-18 07:11:06 -07:00
Dianne Hackborn
2da3cce685 am c14b9ccd: Extend Intent/Uri conversion for use by Browser
Merge commit 'c14b9ccdf13163cae5ce5d21bcf377010b37594b'

* commit 'c14b9ccdf13163cae5ce5d21bcf377010b37594b':
  Extend Intent/Uri conversion for use by Browser
2009-06-17 22:45:54 -07:00
Android (Google) Code Review
dc3be63be3 am e64bb1dd: Merge change 4579 into donut
Merge commit 'e64bb1dd9ed68281af9968cf2cd23b4e49ead76c'

* commit 'e64bb1dd9ed68281af9968cf2cd23b4e49ead76c':
  Fix issue #1924851
2009-06-17 22:45:51 -07:00
Christopher Tate
200baebb11 am e9190a27: Base64 the keys to make filenames in LocalTransport
Merge commit 'e9190a2750e1fb67e300d2c128227cc9b7339efe'

* commit 'e9190a2750e1fb67e300d2c128227cc9b7339efe':
  Base64 the keys to make filenames in LocalTransport
2009-06-17 22:45:46 -07:00
Android (Google) Code Review
e70ecb0863 am 3c2f8e66: Merge change 4456 into donut
Merge commit '3c2f8e6651178742bc685e7bd62fa8a6ca409a74'

* commit '3c2f8e6651178742bc685e7bd62fa8a6ca409a74':
  Replace the stub GoogleTransport with callout to the
2009-06-17 21:49:56 -07:00
Joe Onorato
6bd1fedea0 am 83248c43: backup fixes:
Merge commit '83248c432ffe2e2a17abbc8e4960c26574b46bca'

* commit '83248c432ffe2e2a17abbc8e4960c26574b46bca':
  backup fixes:
2009-06-17 21:49:50 -07:00
Android (Google) Code Review
e79a474056 am 6ce1983a: Merge change 4532 into donut
Merge commit '6ce1983a2b5e9f5e735ac09b270b400084edb7db'

* commit '6ce1983a2b5e9f5e735ac09b270b400084edb7db':
  Fixes #1924909. When restoring managed dialogs, do exactly the same thing as when showing a dialog.
2009-06-17 21:49:35 -07:00
Android (Google) Code Review
9035ab088a am cff19c1a: Merge change 4539 into donut
Merge commit 'cff19c1a014284dce2577f82d931e4c65edd437e'

* commit 'cff19c1a014284dce2577f82d931e4c65edd437e':
  Fixes #1925003. Make ListView honor the android:choiceMode XML attribute.
2009-06-17 21:49:30 -07:00
Romain Guy
fb15b6d2e1 am 465dee4b: Fixes #1819572. Do not resurrect the list\'s selection when the user moved it away.
Merge commit '465dee4b4b491fdbb082218e5eb1010a416992f9'

* commit '465dee4b4b491fdbb082218e5eb1010a416992f9':
  Fixes #1819572. Do not resurrect the list's selection when the user moved it away.
2009-06-17 21:49:26 -07:00
Android (Google) Code Review
00ea06792b am de72697b: Merge change 4524 into donut
Merge commit 'de72697b771d33738c5f9d6c28087504e0796622'

* commit 'de72697b771d33738c5f9d6c28087504e0796622':
  FileRestoreHelper and RestoreHelperDispatcher work.
2009-06-17 21:49:21 -07:00
Android (Google) Code Review
8f87d3fa02 Merge change 4579 into donut
* changes:
  Fix issue #1924851
2009-06-17 21:40:20 -07:00
Android (Google) Code Review
fd3e5839a4 Merge change 4456 into donut
* changes:
  Replace the stub GoogleTransport with callout to the GoogleTransportService (which lives in vendor/google). Use the Google transport by default. Also, fix a bug: Thread.run() != Thread.start()
2009-06-17 19:31:36 -07:00
Nick Pelly
14b8f4ccc6 resolved conflicts for merge of ed336839 to master 2009-06-17 19:06:51 -07:00
Android (Google) Code Review
267b168ec8 am 3f4263fa: Merge change 4411 into donut
Merge commit '3f4263fac6bcc68b3c7fff8e6ac9ad2d97b2ad4c'

* commit '3f4263fac6bcc68b3c7fff8e6ac9ad2d97b2ad4c':
  Squashed commit of the following:
2009-06-17 18:46:21 -07:00