The Android Open Source Project
8d8320f96f
Merge commit 'remotes/goog/eclair' into eclair-release
2009-08-21 07:05:41 -07:00
Jeff Hamilton
72fd1f1ad8
am 0c51de15
: Prefer ContactsProvider over GoogleContactsProvider.
...
Merge commit '0c51de15fd3279f1c67d4b9834ebd7334fe82f79'
* commit '0c51de15fd3279f1c67d4b9834ebd7334fe82f79':
Prefer ContactsProvider over GoogleContactsProvider.
2009-08-21 02:03:41 -07:00
Jeff Hamilton
0c51de15fd
Prefer ContactsProvider over GoogleContactsProvider.
2009-08-21 00:38:17 -05:00
Doug Zongker
98cb09e37a
am 1f8b697a
: am e05628cc
: fix signing user builds
...
Merge commit '1f8b697a7fc3102e495972fec0d8bca7e5698098'
* commit '1f8b697a7fc3102e495972fec0d8bca7e5698098':
fix signing user builds
2009-08-20 18:23:05 -07:00
Doug Zongker
1f8b697a7f
am e05628cc
: fix signing user builds
...
Merge commit 'e05628cc8df4ec4b69befa9652d81eb81f0ab008' into eclair
* commit 'e05628cc8df4ec4b69befa9652d81eb81f0ab008':
fix signing user builds
2009-08-20 18:18:29 -07:00
Doug Zongker
e05628cc8d
fix signing user builds
...
When unzipping a target-files which has been signed with OTA key
replacement, you'll get "overwrite this file?" prompts because the key
files appear in the zip files twice. Suppress these prompts.
Many developer phone products don't define PRODUCT_OTA_PUBLIC_KEYS, so
add a default key.
This change doesn't affect device code.
2009-08-20 18:02:47 -07:00
The Android Open Source Project
7619d63095
DRC51
2009-08-20 16:56:11 -07:00
The Android Open Source Project
44ef1c2d07
Merge commit 'remotes/goog/donut' into donut-release
2009-08-20 16:56:01 -07:00
The Android Open Source Project
1581c91ba9
ERC51B
2009-08-20 12:11:53 -07:00
The Android Open Source Project
9c63057405
Merge commit 'remotes/goog/eclair' into eclair-release
2009-08-20 12:11:41 -07:00
Dirk Dougherty
9e85734425
am 724735d2
: am 6f7ba2dc
: Merge change 20234 into donut
...
Merge commit '724735d2be4dd75207e53dff752feb6bd3a9dd6b'
* commit '724735d2be4dd75207e53dff752feb6bd3a9dd6b':
Remove extraneous quotation mark in template file
2009-08-20 10:41:02 -07:00
Dirk Dougherty
724735d2be
am 6f7ba2dc
: Merge change 20234 into donut
...
Merge commit '6f7ba2dce2c112eb4be33dbad54751d55ddd2276' into eclair
* commit '6f7ba2dce2c112eb4be33dbad54751d55ddd2276':
Remove extraneous quotation mark in template file
2009-08-20 10:36:47 -07:00
Android (Google) Code Review
6f7ba2dce2
Merge change 20234 into donut
...
* changes:
Remove extraneous quotation mark in template file
2009-08-20 10:33:11 -07:00
Andrei Popescu
d6a2e6d384
am fb71fe71
: Clean libwebcore after new WebKit merge
...
Merge commit 'fb71fe7126bf0071537837c454f5d3e0e0c83aa3'
* commit 'fb71fe7126bf0071537837c454f5d3e0e0c83aa3':
Clean libwebcore after new WebKit merge
2009-08-20 09:04:57 -07:00
The Android Open Source Project
0bfe8d0551
ERC51
2009-08-20 07:06:12 -07:00
The Android Open Source Project
439a3a0e2d
Merge commit 'remotes/goog/eclair' into eclair-release
2009-08-20 07:05:58 -07:00
Andrei Popescu
fb71fe7126
Clean libwebcore after new WebKit merge
2009-08-20 12:42:30 +01:00
Phil Dubach
5e3ab04d97
CTS: Enable Python description/plan generator
...
This enables the new description/plan generator added in change
21366.
2009-08-19 17:03:21 -07:00
Dianne Hackborn
bb4ddabb84
am a3f7c20f
: Merge change 21912 into eclair
...
Merge commit 'a3f7c20f907dca3e8de5664bf8c3e7dec4f0db05'
* commit 'a3f7c20f907dca3e8de5664bf8c3e7dec4f0db05':
Bump platform version to 4.
2009-08-19 16:51:28 -07:00
Raphael
7294dae26f
am 28fcfdd7
: Fix broken server Windows SDK build.
...
Merge commit '28fcfdd7dd8752bc9accf800306d82a3a8d138da'
* commit '28fcfdd7dd8752bc9accf800306d82a3a8d138da':
Fix broken server Windows SDK build.
2009-08-19 16:51:27 -07:00
The Android Open Source Project
a9409a26b8
DRC50
2009-08-19 15:06:00 -07:00
The Android Open Source Project
1906fbafdc
Merge commit 'remotes/goog/donut' into donut-release
2009-08-19 15:05:51 -07:00
Android (Google) Code Review
a3f7c20f90
Merge change 21912 into eclair
...
* changes:
Bump platform version to 4.
2009-08-19 14:46:27 -07:00
Raphael
28fcfdd7dd
Fix broken server Windows SDK build.
...
I removed these lines because for some reason building under Windows
fails for me when they are present. However the build server breaks
so I'll rolling them back and I'll try to understand that later.
2009-08-19 14:06:33 -07:00
Raphael
5f9498b7b3
am c798114c
: Merge change 21783 into eclair
...
Merge commit 'c798114c04feab62c22000d6a9bbfa805ce70e55'
* commit 'c798114c04feab62c22000d6a9bbfa805ce70e55':
Windows: Fix platform build.
2009-08-19 12:16:11 -07:00
Scott Main
aeb8fd7ee1
am f036631b
: am 54161d14
: DOCS ONLY. styleheet changes to fix some errors in the print layout and remove extra space from above nested lists, so they fit closer to the parent list item.
...
Merge commit 'f036631b02bca65818cc02767c5389e5de1f67a8'
* commit 'f036631b02bca65818cc02767c5389e5de1f67a8':
DOCS ONLY.
2009-08-19 12:16:10 -07:00
Android (Google) Code Review
c798114c04
Merge change 21783 into eclair
...
* changes:
Windows: Fix platform build.
2009-08-19 12:11:38 -07:00
Raphael
f6ff4c5acf
Windows: Fix platform build.
2009-08-19 11:32:15 -07:00
Scott Main
f036631b02
am 54161d14
: DOCS ONLY. styleheet changes to fix some errors in the print layout and remove extra space from above nested lists, so they fit closer to the parent list item.
...
Merge commit '54161d143931c5be2d49e8f9f215ec8bff2237af' into eclair
* commit '54161d143931c5be2d49e8f9f215ec8bff2237af':
DOCS ONLY.
2009-08-19 11:05:04 -07:00
Dianne Hackborn
e34fdc0113
Bump platform version to 4.
...
Not sure why this didn't get integrated from Donut.
2009-08-19 11:00:21 -07:00
Chih-Chung Chang
1c86532604
am 0db6f1ed
: Need this to update system properties (for change 21876).
...
Merge commit '0db6f1ed396fef320d52f722c45daadf9a98f9ee'
* commit '0db6f1ed396fef320d52f722c45daadf9a98f9ee':
Need this to update system properties (for change 21876).
2009-08-19 07:23:57 -07:00
The Android Open Source Project
fd0ac871ec
ERC50
2009-08-19 07:06:21 -07:00
Chih-Chung Chang
0db6f1ed39
Need this to update system properties (for change 21876).
2009-08-19 18:14:23 +08:00
Scott Main
54161d1439
DOCS ONLY.
...
styleheet changes to fix some errors in the print layout
and remove extra space from above nested lists, so they fit
closer to the parent list item.
2009-08-18 19:00:11 -07:00
The Android Open Source Project
dfe9c92a5e
DRC49
2009-08-18 14:11:06 -07:00
The Android Open Source Project
530107a5ce
ERC49
2009-08-18 07:05:53 -07:00
The Android Open Source Project
92c9c970f5
DRC48
2009-08-17 15:47:00 -07:00
Jesse Wilson
90c1d538f9
Fixed droiddoc to properly version varargs and type-parameter methods.
...
This also removes many false-positive warnings in the droiddoc output
from methods whose visibility didn't require documentation.
2009-08-17 14:23:31 -07:00
The Android Open Source Project
7a7f713308
ERC48
2009-08-17 07:05:38 -07:00
The Android Open Source Project
24a9d84fd3
Merge commit 'remotes/goog/eclair' into eclair-release
2009-08-17 07:05:26 -07:00
Doug Zongker
0c72ede79e
am badd2ca4
: fix endianness problem with the tail of the signature comment
...
Merge commit 'badd2ca451ee7a408f55632025cbe69649b426b5'
* commit 'badd2ca451ee7a408f55632025cbe69649b426b5':
fix endianness problem with the tail of the signature comment
2009-08-14 17:28:43 -07:00
Doug Zongker
badd2ca451
fix endianness problem with the tail of the signature comment
...
The two 0xff bytes were intended to easily distinguish files with
whole file signatures from those without, but I got the endianness
backwards. Go ahead and fix that, as long as I'm making changes to
the verifier anyway.
Check for a signature that includes the sequence 0x50 0x4b 0x05 0x06,
which looks to minzip like the start of the EOCD block.
2009-08-14 17:15:46 -07:00
Doug Zongker
c00d14d937
am 09cf5600
: explicitly set max heap size when running signapk
...
Merge commit '09cf56001a214bdb22b720c323b9c7c73feea63f'
* commit '09cf56001a214bdb22b720c323b9c7c73feea63f':
explicitly set max heap size when running signapk
2009-08-14 15:30:06 -07:00
Doug Zongker
09cf56001a
explicitly set max heap size when running signapk
...
On the mac, -Xmx defaults to 64MB, which isn't enough to do a
whole-file signing of a full OTA package.
2009-08-14 15:25:06 -07:00
Doug Zongker
5dfed8f8f6
am 951495fc
: update OTA package maker to do whole-file signature
...
Merge commit '951495fc4802a3603f654c02c7acceda4859f5e1'
* commit '951495fc4802a3603f654c02c7acceda4859f5e1':
update OTA package maker to do whole-file signature
2009-08-14 15:12:45 -07:00
Doug Zongker
a337914243
am c6cf01a1
: add whole-file signature mode to SignApk
...
Merge commit 'c6cf01a1170c3a7a5b03135b01cf97f06e1b953d'
* commit 'c6cf01a1170c3a7a5b03135b01cf97f06e1b953d':
add whole-file signature mode to SignApk
2009-08-14 15:12:43 -07:00
The Android Open Source Project
2e8ee4239d
DRC45B
2009-08-14 14:30:53 -07:00
Doug Zongker
951495fc48
update OTA package maker to do whole-file signature
...
Use the new -w flag to SignApk when signing OTA packages.
2009-08-14 14:07:15 -07:00
Doug Zongker
c6cf01a117
add whole-file signature mode to SignApk
...
Make SignApk generate a signature for (nearly) the entire zip file
when run with the -w option. The signature covers all of the zip file
except for the archive comment (conveniently the last thing in a zip
file); the archive comment field is used to contain the signature
itself.
2009-08-14 12:25:05 -07:00
Android (Google) Code Review
5582d77905
Merge change 21042
...
* changes:
add whole-file signature mode to SignApk
2009-08-14 12:16:25 -07:00