Commit Graph

1494 Commits

Author SHA1 Message Date
Android (Google) Code Review
6aa29183cb Merge change 3841
* changes:
  Fix botched merge from commit b61498d1ac8e25f0024dcde46b41bcf0d8336d89
2009-06-10 18:06:18 -07:00
Android (Google) Code Review
bfecc578a9 am 1d7d5db7: Merge change 3799 into donut
Merge commit '1d7d5db74f14e871c7be719a0cddf52a5a40dcbf'

* commit '1d7d5db74f14e871c7be719a0cddf52a5a40dcbf':
  Turned on the windows media related test cases as the binary already integrated.
2009-06-10 17:20:04 -07:00
Christopher Tate
1dc5293b6f am c7b31e3c: The rest of the basic flow for restore
Merge commit 'c7b31e3c3cd71129557d4bf9e3fbcebb9235aba5'

* commit 'c7b31e3c3cd71129557d4bf9e3fbcebb9235aba5':
  The rest of the basic flow for restore
2009-06-10 17:19:57 -07:00
Android (Google) Code Review
d39165e63c am 2795c2d6: Merge change 3806 into donut
Merge commit '2795c2d6b73f6e72565569f7d4f2f4b34e526bba'

* commit '2795c2d6b73f6e72565569f7d4f2f4b34e526bba':
  Fix a couple null pointer exceptions in CDMA voice call handling.
2009-06-10 17:19:54 -07:00
Android (Google) Code Review
be7629e5f1 Merge change 3799 into donut
* changes:
  Turned on the windows media related test cases as the binary already integrated.
2009-06-10 17:10:05 -07:00
The Android Open Source Project
0ff324309a Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-06-10 16:43:38 -07:00
Android (Google) Code Review
6107a61a8f Merge change 3806 into donut
* changes:
  Fix a couple null pointer exceptions in CDMA voice call handling.
2009-06-10 16:38:12 -07:00
Android (Google) Code Review
dd083ef70b am 1f35bf18: Merge change 3795 into donut
Merge commit '1f35bf18ade606810843c8ec10445fc884d686cb'

* commit '1f35bf18ade606810843c8ec10445fc884d686cb':
  URI/extra data for inline scheme.
2009-06-10 16:31:52 -07:00
Mitsuru Oshima
31d99a51cc am e5fb3288: resolution support fix/improvement * adding compatibility menu * backup gravity * set expanable=true if the screen size is hvga * density. * added "supports any density" mode. I\'ll add sdk check later. * disallow to catch orientation c
Merge commit 'e5fb328825995aa33b5b7ecf8b5bee2b17f81715'

* commit 'e5fb328825995aa33b5b7ecf8b5bee2b17f81715':
  resolution support fix/improvement
2009-06-10 16:31:36 -07:00
Android (Google) Code Review
7958dc86e2 am ca436e24: Merge change 3782 into donut
Merge commit 'ca436e24dec0fa258a8a756c3e7d07bcb096c5b3'

* commit 'ca436e24dec0fa258a8a756c3e7d07bcb096c5b3':
  Reimport Portuguese translations.
2009-06-10 16:31:33 -07:00
Android (Google) Code Review
ba5c9ae759 am f50ab7f4: Merge change 3777 into donut
Merge commit 'f50ab7f46296786f575b2d171ec05a661d129015'

* commit 'f50ab7f46296786f575b2d171ec05a661d129015':
  Process the response of RIL_REQUEST_REPORT_SMS_MEMORY_STATUS.
2009-06-10 16:31:29 -07:00
Android (Google) Code Review
5e817bf3c1 am a45711aa: Merge change 3765 into donut
Merge commit 'a45711aaebc514290fdf0c93f07a3120dc160ddb'

* commit 'a45711aaebc514290fdf0c93f07a3120dc160ddb':
  Add a gservices flag to limit the size of protobufs we can gzip
2009-06-10 16:31:27 -07:00
Android (Google) Code Review
8c7467bd2e am 732912a1: Merge change 3730 into donut
Merge commit '732912a103e985520dba9c022a40bc21b4c4ced5'

* commit '732912a103e985520dba9c022a40bc21b4c4ced5':
  Restructuring the TTS files so that it works as a Service
2009-06-10 16:31:23 -07:00
Romain Guy
7ae696157f resolved conflicts for merge of f31cbb to master 2009-06-10 16:30:18 -07:00
Android (Google) Code Review
f7aadd905a Merge change 3808
* changes:
  Split renderscript java code from test apps.  Update makefiles.
2009-06-10 16:24:47 -07:00
Android (Google) Code Review
d3280bca2d Merge change 3795 into donut
* changes:
  URI/extra data for inline scheme.
2009-06-10 16:24:01 -07:00
Android (Google) Code Review
436a369649 Merge change 3796
* changes:
  Added data restriction constants to ContactsContract.
2009-06-10 16:14:18 -07:00
Android (Google) Code Review
e6b57de70d am 4a60b887: Merge change 3761 into donut
Merge commit '4a60b887d4b9744126e62b094a9597ee8e924640'

* commit '4a60b887d4b9744126e62b094a9597ee8e924640':
  Added support to record page load time for each url.
2009-06-10 15:33:08 -07:00
Android (Google) Code Review
07c6bbf089 am b11e670e: Merge change 3754 into donut
Merge commit 'b11e670e56b30022dbaaa921390005a95dfd337b'

* commit 'b11e670e56b30022dbaaa921390005a95dfd337b':
  Fix some 12- vs 24-hour problems in the FormatDateRange strings.
2009-06-10 15:33:04 -07:00
Android (Google) Code Review
6adce14324 am 684a2edb: Merge change 3577 into donut
Merge commit '684a2edbe192a2a76684c5d6855773196d2e1a2e'

* commit '684a2edbe192a2a76684c5d6855773196d2e1a2e':
  Make aapt Error out when an overlay adds a string.
2009-06-10 15:32:56 -07:00
Eric Fischer
fac61b00be am c0c0b684: am a8c3821e: AI 149721: Import Portuguese translations.
Merge commit 'c0c0b6844e4e4cd3b872a80e51416cfd9ca124d9'

* commit 'c0c0b6844e4e4cd3b872a80e51416cfd9ca124d9':
  AI 149721: Import Portuguese translations.
2009-06-10 15:32:46 -07:00
Android (Google) Code Review
00801c24af Merge change 3782 into donut
* changes:
  Reimport Portuguese translations.
2009-06-10 15:20:55 -07:00
Android (Google) Code Review
f3a33dc9e0 Merge change 3777 into donut
* changes:
  Process the response of RIL_REQUEST_REPORT_SMS_MEMORY_STATUS.
2009-06-10 15:17:15 -07:00
Android (Google) Code Review
79f105e807 Merge change 3765 into donut
* changes:
  Add a gservices flag to limit the size of protobufs we can gzip
2009-06-10 15:11:52 -07:00
Android (Google) Code Review
b17caeb749 Merge change 3730 into donut
* changes:
  Restructuring the TTS files so that it works as a Service
2009-06-10 15:09:37 -07:00
Android (Google) Code Review
309f4d7236 Merge change 3776
* changes:
  Add named objects and implement support for ProgramFragmentStore and ProgramFragment to be used by name in scripts.
2009-06-10 15:05:22 -07:00
Android (Google) Code Review
dd0cf738e1 Merge change 3760 into donut
* changes:
  Enable HierarchyViewer on debuggable builds, even if they're secure.
2009-06-10 15:03:06 -07:00
Android (Google) Code Review
e8b0af9230 Merge change 3761 into donut
* changes:
  Added support to record page load time for each url.
2009-06-10 15:03:06 -07:00
Android (Google) Code Review
9e7fa75e0b Merge change 3754 into donut
* changes:
  Fix some 12- vs 24-hour problems in the FormatDateRange strings.
2009-06-10 15:03:06 -07:00
Charles Chen
fff359f3bf Restructuring the TTS files so that it works as a Service 2009-06-10 13:31:09 -07:00
Android (Google) Code Review
5fc909ca1c Merge change 3751
* changes:
  Accept freeMemory messages and pass them to the native code
2009-06-10 13:11:05 -07:00
Android (Google) Code Review
7ee6bfa848 Merge change 3577 into donut
* changes:
  Make aapt Error out when an overlay adds a string.
2009-06-10 12:36:45 -07:00
Eric Fischer
a723b132a5 am a8c3821e: AI 149721: Import Portuguese translations.
Merge commit 'a8c3821e5a9017b557744bf3439b0cde5ace86db' into donut

* commit 'a8c3821e5a9017b557744bf3439b0cde5ace86db':
  AI 149721: Import Portuguese translations.
2009-06-10 12:32:04 -07:00
Android (Google) Code Review
5025b5df03 am 6b4b50b8: Merge change 2900 into donut
Merge commit '6b4b50b8079aa274727c3120f858179eb6259351'

* commit '6b4b50b8079aa274727c3120f858179eb6259351':
  Add support for custom tab views in TabHost and TabWidget.
2009-06-10 12:20:48 -07:00
Android (Google) Code Review
239a034dda Merge change 2900 into donut
* changes:
  Add support for custom tab views in TabHost and TabWidget.
2009-06-10 11:41:49 -07:00
Android (Google) Code Review
4f9451184b am 218ebf12: Merge change 3178 into donut
Merge commit '218ebf1274d5eefc59c55cdc60d83d61faeb5c1b'

* commit '218ebf1274d5eefc59c55cdc60d83d61faeb5c1b':
  Add additional parameters to SETUP_DATA_CALL and SMS response.
2009-06-10 11:37:24 -07:00
Android (Google) Code Review
4d3829e689 Merge change 3178 into donut
* changes:
  Add additional parameters to SETUP_DATA_CALL and SMS response.
2009-06-10 11:35:43 -07:00
Android (Google) Code Review
de97c15685 am b81645c8: Merge change 3726 into donut
Merge commit 'b81645c868b3d596b5ac56822959feb629a8651e'

* commit 'b81645c868b3d596b5ac56822959feb629a8651e':
  ActivityManager: Ensure that we clear the calling process identity around calls to Process.setProcessGroup().
2009-06-10 11:09:13 -07:00
Android (Google) Code Review
32c5199d1c am 0e7cf636: Merge change 3725 into donut
Merge commit '0e7cf6366b657498e51b7c7a433b80cfb83152cb'

* commit '0e7cf6366b657498e51b7c7a433b80cfb83152cb':
  process: Clean up cgroup management
2009-06-10 11:09:10 -07:00
Android (Google) Code Review
d6e5b68806 Merge change 3726 into donut
* changes:
  ActivityManager: Ensure that we clear the calling process identity around calls to Process.setProcessGroup().
2009-06-10 11:07:58 -07:00
Android (Google) Code Review
6e953081b2 Merge change 3725 into donut
* changes:
  process: Clean up cgroup management
2009-06-10 11:07:52 -07:00
Android (Google) Code Review
ecb2ebf43c am 9e09e0f4: Merge change 3724 into donut
Merge commit '9e09e0f439ab30b8856d46827623652d09b7477b'

* commit '9e09e0f439ab30b8856d46827623652d09b7477b':
  zygote: Add CAP_SYS_NICE to system server capabilities
2009-06-10 11:06:54 -07:00
Android (Google) Code Review
5396845ce8 Merge change 3724 into donut
* changes:
  zygote: Add CAP_SYS_NICE to system server capabilities
2009-06-10 11:05:05 -07:00
Christopher Tate
eed944d348 am df01deaa: More restore plumbing, plus add suggested-backoff to transport API
Merge commit 'df01deaacff82b918b4f0ba774d5ad3087543629'

* commit 'df01deaacff82b918b4f0ba774d5ad3087543629':
  More restore plumbing, plus add suggested-backoff to transport API
2009-06-10 10:59:20 -07:00
Android (Google) Code Review
d7af462980 am 8f094ca7: Merge change 3686 into donut
Merge commit '8f094ca7d045132ec93d4e903e784a3c077708c3'

* commit '8f094ca7d045132ec93d4e903e784a3c077708c3':
  Fix cleanupConnection when switching from wifi.
2009-06-10 10:54:02 -07:00
Android (Google) Code Review
f29c29b606 Merge change 3686 into donut
* changes:
  Fix cleanupConnection when switching from wifi.
2009-06-10 10:50:28 -07:00
Android (Google) Code Review
f526044a0d Merge change 3656
* changes:
  Fix #1907439. If there is uncommitted content when gzipped content got EOFException, we need to commit them.
2009-06-10 10:38:04 -07:00
Android (Google) Code Review
c59c54d9d1 am 295e7248: Merge change 3676 into donut
Merge commit '295e7248b11557cf80ee9b7a12009d9cec5bd8b0'

* commit '295e7248b11557cf80ee9b7a12009d9cec5bd8b0':
  Get the FormatDateRange tests passing again.
2009-06-10 10:04:10 -07:00
Android (Google) Code Review
f48efaca78 Merge change 3676 into donut
* changes:
  Get the FormatDateRange tests passing again.
2009-06-10 10:02:07 -07:00
Android (Google) Code Review
d26e63c156 Merge change 3673
* changes:
  WifiStateTracker: Add support for positive RSSI values.
2009-06-10 09:38:23 -07:00