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
Android (Google) Code Review
0bade147d1
Merge change 4721 into donut
...
* changes:
Make signature checks on restore work with unsigned apps
2009-06-18 20:49:06 -07:00
Android (Google) Code Review
e331781e94
am e0b7e916: Merge change 4679 into donut
...
Merge commit 'e0b7e916a1259d2dd9c116695607f9877ec56056'
* commit 'e0b7e916a1259d2dd9c116695607f9877ec56056':
Replace the dummy code with Keystore for <keygen> support.
2009-06-18 19:54:47 -07:00
Android (Google) Code Review
27226580b5
Merge change 4679 into donut
...
* changes:
Replace the dummy code with Keystore for <keygen> support.
2009-06-18 19:52:00 -07:00
Android (Google) Code Review
05915a4d9d
am c6282977: Merge change 4718 into donut
...
Merge commit 'c6282977180c220b1a68c23a328e7d75a11963ab'
* commit 'c6282977180c220b1a68c23a328e7d75a11963ab':
Fix sim-eng build and simplify previous lcd-density related patch
2009-06-18 19:46:59 -07:00
Android (Google) Code Review
4182cf6308
Merge change 4718 into donut
...
* changes:
Fix sim-eng build and simplify previous lcd-density related patch
2009-06-18 19:45:07 -07:00
David 'Digit' Turner
ae71accf63
Fix sim-eng build and simplify previous lcd-density related patch
2009-06-19 04:41:12 +02:00
Android (Google) Code Review
c5e321700d
am 63e7155c: Merge change 4696 into donut
...
Merge commit '63e7155c7d1d0c3f0027400aa09e9a45f648a80d'
* commit '63e7155c7d1d0c3f0027400aa09e9a45f648a80d':
Fix targetSdkVersion, make resize mode a flag, delayed dexopt, easy ApplicationInfo.
2009-06-18 19:35:32 -07:00
Android (Google) Code Review
5471976b51
Merge change 4696 into donut
...
* changes:
Fix targetSdkVersion, make resize mode a flag, delayed dexopt, easy ApplicationInfo.
2009-06-18 19:33:33 -07:00
Android (Google) Code Review
4910dc6256
am 5502f04c: Merge change 4709 into donut
...
Merge commit '5502f04c1dcf2b1918858bacb99fb0480a711707'
* commit '5502f04c1dcf2b1918858bacb99fb0480a711707':
backup stuff
2009-06-18 19:04:56 -07:00
Android (Google) Code Review
0388b51341
am 16ce3504: Merge change 4708 into donut
...
Merge commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9'
* commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9':
Make RestoreHelper and friends also write out the snapshot state.
2009-06-18 19:04:50 -07:00
Android (Google) Code Review
c62834b9fa
Merge change 4709 into donut
...
* changes:
backup stuff
2009-06-18 19:02:39 -07:00
Android (Google) Code Review
1c5550974f
Merge change 4708 into donut
...
* changes:
Make RestoreHelper and friends also write out the snapshot state.
2009-06-18 19:02:30 -07:00
Android (Google) Code Review
bb4818d155
am 568b62c8: Merge change 4702 into donut
...
Merge commit '568b62c861ed4abc792d517f61640610400614e1'
* commit '568b62c861ed4abc792d517f61640610400614e1':
Fix bug 1927213 test failures.
2009-06-18 18:47:24 -07:00
Android (Google) Code Review
88247e0ae0
Merge change 4702 into donut
...
* changes:
Fix bug 1927213 test failures.
2009-06-18 18:45:08 -07:00
Christopher Tate
f5e53cc5cb
am abce4e87: Use signatures on restore
...
Merge commit 'abce4e8714bed26a2b37b20ad3f02cf619d71c9a'
* commit 'abce4e8714bed26a2b37b20ad3f02cf619d71c9a':
Use signatures on restore
2009-06-18 18:42:02 -07:00
Joe Onorato
6bda7fd556
backup stuff
2009-06-18 18:41:11 -07:00
Joe Onorato
da1430be26
Make RestoreHelper and friends also write out the snapshot state.
2009-06-18 18:41:11 -07:00
Android (Google) Code Review
4b2dcae185
Merge change 4700
...
* changes:
Merge commit 'goog/master-webkit-merge' into webkit-merge-44544
2009-06-18 18:29:49 -07:00
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