Commit Graph

1881 Commits

Author SHA1 Message Date
Mathias Agopian
cca6b4267d Merge commit 'goog/master' into merge_master 2009-06-19 17:41:14 -07:00
Android (Google) Code Review
f84dda74d5 am 79ac8770: Merge change 4834 into donut
Merge commit '79ac87704d2e38afb06356704e4b52c739237f40'

* commit '79ac87704d2e38afb06356704e4b52c739237f40':
  Fix a bug where wrong variable was used for comparison.
2009-06-19 17:25:55 -07:00
Android (Google) Code Review
70897d2801 Merge change 4834 into donut
* changes:
  Fix a bug where wrong variable was used for comparison.
2009-06-19 17:24:32 -07:00
Android (Google) Code Review
3a05f1974f am b92f7040: Merge change 4847 into donut
Merge commit 'b92f7040e8294151fd915fd649bf7942a8b67463'

* commit 'b92f7040e8294151fd915fd649bf7942a8b67463':
  Add permission tests for IHardwareService.
2009-06-19 17:14:09 -07:00
Android (Google) Code Review
63dd448ac7 Merge change 4847 into donut
* changes:
  Add permission tests for IHardwareService.
2009-06-19 17:12:55 -07:00
Mathias Agopian
f9d932774e fix a memory corruption where a SF Client could be used after it's been destroyed 2009-06-19 17:00:27 -07:00
Android (Google) Code Review
1cacf3d48c am b92c45a4: Merge change 4831 into donut
Merge commit 'b92c45a4bc4331378a31bb4bc84de02fa631a247'

* commit 'b92c45a4bc4331378a31bb4bc84de02fa631a247':
  Add app version to the backup metadata
2009-06-19 16:44:10 -07:00
Android (Google) Code Review
03428fcc8b am 1585bd24: Merge change 4828 into donut
Merge commit '1585bd24c10d16351f89e32dddbfa799f18db6bd'

* commit '1585bd24c10d16351f89e32dddbfa799f18db6bd':
  Report densities in badging, debugging for nine patch bug.
2009-06-19 16:44:07 -07:00
Grace Kloba
f5702d01b9 am 3af8e938: Change addCertificate to take byte[] instead of String as we don\'t know the encoding.
Merge commit '3af8e9389e008c0076b86cc6b3c6f005e7473d10'

* commit '3af8e9389e008c0076b86cc6b3c6f005e7473d10':
  Change addCertificate to take byte[] instead of String as we don't know the encoding.
2009-06-19 16:43:59 -07:00
Android (Google) Code Review
de083920ea am 52546575: Merge change 4818 into donut
Merge commit '5254657540b0a6ad54be6229b68fa5626e4ef9e5'

* commit '5254657540b0a6ad54be6229b68fa5626e4ef9e5':
  Added in Settings.Secure default country and variant for the default TTS language.
2009-06-19 16:43:46 -07:00
Android (Google) Code Review
6bd1b1d5f1 am b4e456bf: Merge change 4785 into donut
Merge commit 'b4e456bf1823e2dd8c975ae02451b7b72541c236'

* commit 'b4e456bf1823e2dd8c975ae02451b7b72541c236':
  Fix issue #1753079: running instrumentation in shared processes.
2009-06-19 16:43:39 -07:00
Mathias Agopian
cd8c5e29c2 release the last reference to surfaces explicitely instead of letting it go implicitely when the message is destroyed 2009-06-19 16:24:02 -07:00
Android (Google) Code Review
2625774d59 Merge change 4843
* changes:
  checkpoint filmstrip, implemented TLS.
2009-06-19 16:07:59 -07:00
Android (Google) Code Review
51039ae65c Merge change 4719
* changes:
  Fix two minor issues.  Rename launchID to launchIndex and make util class Matrix public for apps to use.
2009-06-19 16:07:37 -07:00
Android (Google) Code Review
3aaa79e882 Merge change 4831 into donut
* changes:
  Add app version to the backup metadata
2009-06-19 15:38:41 -07:00
Android (Google) Code Review
4018f35e27 Merge change 4828 into donut
* changes:
  Report densities in badging, debugging for nine patch bug.
2009-06-19 15:37:03 -07:00
Dianne Hackborn
be1bc0a1f9 Report densities in badging, debugging for nine patch bug.
The aapt tool now reports all available densities like it already did
for locales.  Also this includes more resource data output, which I
was using to examine bug #1867049 (which at this point I am unable to
reproduce).
2009-06-19 15:13:28 -07:00
Android (Google) Code Review
1667686778 Merge change 4688
* changes:
  Copies the Contacts.Intents class to ContactsContract.
2009-06-19 14:56:13 -07:00
Android (Google) Code Review
bfbe9a73e6 am 4d1b5bd1: Merge change 4808 into donut
Merge commit '4d1b5bd148d0830d2acc03bafbe58dfd17e5b3f8'

* commit '4d1b5bd148d0830d2acc03bafbe58dfd17e5b3f8':
  Fixes #1928566. Prevents runtime restart upon configuration change.
2009-06-19 14:49:49 -07:00
Android (Google) Code Review
9a5575470e am 066e6bfd: Merge change 4792 into donut
Merge commit '066e6bfd01a5ddd4748eacdc82fee5374e2af929'

* commit '066e6bfd01a5ddd4748eacdc82fee5374e2af929':
  when we reset a paint, it should return to the state it was in when it was first created.
2009-06-19 14:49:44 -07:00
The Android Open Source Project
e84495e2d8 merge 9ebd737e w/conflicts 2009-06-19 14:47:58 -07:00
Android (Google) Code Review
cca55acd69 Merge change 4818 into donut
* changes:
  Added in Settings.Secure default country and variant for the default TTS language.
2009-06-19 14:43:37 -07:00
Android (Google) Code Review
51f57c706d Merge change 4785 into donut
* changes:
  Fix issue #1753079: running instrumentation in shared processes.
2009-06-19 14:24:39 -07:00
Android (Google) Code Review
31e3a43c3c Merge change 4815
* changes:
  GoogleFeedback handles errors in core apps.
2009-06-19 13:59:48 -07:00
Android (Google) Code Review
7d5b42816b Merge change 4811
* changes:
  Process new property definitions for JIT-specific options for apps performance tuning and debugging.
2009-06-19 13:53:53 -07:00
Android (Google) Code Review
af1d9f56d7 Merge change 4808 into donut
* changes:
  Fixes #1928566. Prevents runtime restart upon configuration change.
2009-06-19 13:31:14 -07:00
Android (Google) Code Review
e7d9b98ec0 Merge change 4792 into donut
* changes:
  when we reset a paint, it should return to the state it was in when it was first created. for java, this means setting its text-encoding to UTF16...
2009-06-19 13:30:15 -07:00
Android (Google) Code Review
e9d45a1fd6 Merge change 4793 into donut
* changes:
  dpi changes for webview
2009-06-19 13:24:44 -07:00
Android (Google) Code Review
6c94e5ebef am b00518d8: Merge change 4796 into donut
Merge commit 'b00518d81550c638728b53346a2a25f0a80a1049'

* commit 'b00518d81550c638728b53346a2a25f0a80a1049':
  Move USE_LOCATION_FOR_SERVICES to Secure.
2009-06-19 12:57:22 -07:00
Android (Google) Code Review
77862a539c Merge change 4796 into donut
* changes:
  Move USE_LOCATION_FOR_SERVICES to Secure.
2009-06-19 12:55:34 -07:00
Android (Google) Code Review
81bc9a018d am ab48bb9c: Merge change 4686 into donut
Merge commit 'ab48bb9c008ade65e0f1313088a3089f5b65e8de'

* commit 'ab48bb9c008ade65e0f1313088a3089f5b65e8de':
  Set AuthType to 0 if username is not specified.
2009-06-19 12:15:39 -07:00
Android (Google) Code Review
fc699ca740 Merge change 4686 into donut
* changes:
  Set AuthType to 0 if username is not specified.
2009-06-19 12:13:50 -07:00
Android (Google) Code Review
cd7065a933 am f781b39c: Merge change 4786 into donut
Merge commit 'f781b39cb89dc19e6ad090bd3eb1bedbe7928429'

* commit 'f781b39cb89dc19e6ad090bd3eb1bedbe7928429':
  gps: Set SUPL server via hostname rather than IP address.
2009-06-19 12:12:18 -07:00
Android (Google) Code Review
f67ed06dba am ba6409f1: Merge change 4706 into donut
Merge commit 'ba6409f1f69db7dfa16d5b914d2bc41a3aa43caf'

* commit 'ba6409f1f69db7dfa16d5b914d2bc41a3aa43caf':
  Add a new checkin server flag for Vending Machine heartbeats.
2009-06-19 12:12:15 -07:00
Android (Google) Code Review
7aa77b4924 Merge change 4786 into donut
* changes:
  gps: Set SUPL server via hostname rather than IP address.
2009-06-19 12:09:36 -07:00
Android (Google) Code Review
ab4b3d4637 Merge change 4706 into donut
* changes:
  Add a new checkin server flag for Vending Machine heartbeats.
2009-06-19 11:50:22 -07:00
Dianne Hackborn
b0bfe9655a am 3d74bb4a: Add "why?" button to low battery dialog.
Merge commit '3d74bb4ab27ae9601f5c9c3706fad287845fb672'

* commit '3d74bb4ab27ae9601f5c9c3706fad287845fb672':
  Add "why?" button to low battery dialog.
2009-06-19 11:49:27 -07:00
Android (Google) Code Review
ad25556851 Merge change 4550
* changes:
  add a checkin eventlog tag for reporting GTalk heartbeat timeout; remove unused adaptive heartbeat settings.
2009-06-19 11:40:46 -07:00
Android (Google) Code Review
c343ad835a am 03255de3: Merge change 4757 into donut
Merge commit '03255de32d127d17504b6d475e6e79190dd637f8'

* commit '03255de32d127d17504b6d475e6e79190dd637f8':
  Add getBatteryUsageHint() to BluetoothHeadset for power monitoring.
2009-06-19 11:31:37 -07:00
Android (Google) Code Review
03868d3195 Merge change 4757 into donut
* changes:
  Add getBatteryUsageHint() to BluetoothHeadset for power monitoring.
2009-06-19 11:29:57 -07:00
Android (Google) Code Review
3138d2ee29 am 697f9caf: Merge change 4687 into donut
Merge commit '697f9caf8b63fa87ecfeb9a29aa129ba5321641f'

* commit '697f9caf8b63fa87ecfeb9a29aa129ba5321641f':
  Use standalone month name instead of format month name in year-month format.
2009-06-19 10:38:51 -07:00
Android (Google) Code Review
88bc7cb1e7 am 6afe8133: Merge change 4720 into donut
Merge commit '6afe81339ed973f1ef4a6c30110d5ce3b001ea4c'

* commit '6afe81339ed973f1ef4a6c30110d5ce3b001ea4c':
  Fix string formatters in SettingsProvider SecurityException message.
2009-06-19 10:38:47 -07:00
Suchi Amalapurapu
0ed6f9a8ab am bc806f65: Remove deprecated api. Aptly rename freeStorageWithIntent to freeStorage.
Merge commit 'bc806f65edc33f6eda0f475ac84e5e037a013a90'

* commit 'bc806f65edc33f6eda0f475ac84e5e037a013a90':
  Remove deprecated api. Aptly rename freeStorageWithIntent to freeStorage.
2009-06-19 10:38:45 -07:00
Android (Google) Code Review
0b0616deda Merge change 4687 into donut
* changes:
  Use standalone month name instead of format month name in year-month format.
2009-06-19 10:30:15 -07:00
Android (Google) Code Review
7bd5cb6eeb Merge change 4720 into donut
* changes:
  Fix string formatters in SettingsProvider SecurityException message.
2009-06-19 10:29:59 -07:00
Android (Google) Code Review
88ae985d38 am 2b1aed10: Merge change 4527 into donut
Merge commit '2b1aed1021fb472de83c4c0143f2c4452244a0af'

* commit '2b1aed1021fb472de83c4c0143f2c4452244a0af':
  Fix Canvas.finalize() for the case where the constructor throws an exception
2009-06-19 10:09:00 -07:00
Android (Google) Code Review
2bbeb339a3 Merge change 4527 into donut
* changes:
  Fix Canvas.finalize() for the case where the constructor throws an exception before the native canvas instance was created.
2009-06-19 10:07:29 -07:00
Wu-cheng Li
4a23817d1e am 649f99e8: Add Intent.ACTION_SEND_MULTIPLE
Merge commit '649f99e8347984c1e031dae302830f4c9ebd3df4'

* commit '649f99e8347984c1e031dae302830f4c9ebd3df4':
  Add Intent.ACTION_SEND_MULTIPLE
2009-06-19 03:55:09 -07:00
Android (Google) Code Review
f8715dccd9 Merge change 4621
* changes:
  Update WebStorage methods used by DumpRenderTree to complete synchronously if they are called on the webcore thread.
2009-06-19 02:09:28 -07:00
Android (Google) Code Review
6b32d1af03 am fd5f0875: Merge change 4721 into donut
Merge commit 'fd5f087536dcb04ac9c46f2b19f87a37455390b0'

* commit 'fd5f087536dcb04ac9c46f2b19f87a37455390b0':
  Make signature checks on restore work with unsigned apps
2009-06-18 20:51:09 -07:00