OSDN Git Service
The Android Open Source Project [Wed, 9 Sep 2009 17:44:02 +0000 (10:44 -0700)]
ERC71
The Android Open Source Project [Wed, 9 Sep 2009 17:43:49 +0000 (10:43 -0700)]
Merge commit 'remotes/goog/eclair' into eclair-release
Andrei Popescu [Tue, 8 Sep 2009 18:47:22 +0000 (19:47 +0100)]
Cleanstep required by switching back to JSC in the browser
The Android Open Source Project [Tue, 8 Sep 2009 14:27:14 +0000 (07:27 -0700)]
ERC70
The Android Open Source Project [Tue, 8 Sep 2009 14:26:56 +0000 (07:26 -0700)]
Merge commit 'remotes/goog/eclair' into eclair-release
android-build SharedAccount [Mon, 7 Sep 2009 07:40:35 +0000 (00:40 -0700)]
ERC65B - after the fact
Mike Lockwood [Thu, 3 Sep 2009 19:01:07 +0000 (15:01 -0400)]
Add clean step for /system/bin/bugreport symlink
Change-Id: Ib2abb22184b16b6b3c5bc0e38141922f3fcbfca0
Signed-off-by: Mike Lockwood <lockwood@android.com>
The Android Open Source Project [Thu, 3 Sep 2009 15:36:28 +0000 (08:36 -0700)]
ERC65
The Android Open Source Project [Thu, 3 Sep 2009 15:36:16 +0000 (08:36 -0700)]
Merge commit 'remotes/goog/eclair' into eclair-release
Dirk Dougherty [Thu, 3 Sep 2009 01:58:52 +0000 (18:58 -0700)]
am
4d545a82: Merge change 23037 into donut
Merge commit '
4d545a82917db0ca90494e4cfb7944e1b5ea564a' into eclair
* commit '
4d545a82917db0ca90494e4cfb7944e1b5ea564a':
Doc changes for SDK update.
Android (Google) Code Review [Thu, 3 Sep 2009 01:57:09 +0000 (18:57 -0700)]
Merge change 23037 into donut
* changes:
Doc changes for SDK update. Update SDK toc template.
Doug Zongker [Wed, 2 Sep 2009 18:10:51 +0000 (11:10 -0700)]
do a pass of normal-chunk-merging before comparing src and tgt files
Merge the gzip footer and header together with any adjacent normal
chunks before comparing chunk structures; this should make the
recovery-from-boot diff not fail due to differences in the footer
after the ramdisk part of the image.
The Android Open Source Project [Wed, 2 Sep 2009 15:36:47 +0000 (08:36 -0700)]
ERC64
Doug Zongker [Wed, 2 Sep 2009 00:53:34 +0000 (17:53 -0700)]
use imgdiff -z to diff zipfiles
imgdiff now understands the zip file format and can produce smaller
patches by doing the patching in uncompressed space. Start taking
advantage of this for .zip, .apk, and .jar files.
The Android Open Source Project [Tue, 1 Sep 2009 22:15:59 +0000 (15:15 -0700)]
ERC63B
The Android Open Source Project [Tue, 1 Sep 2009 22:15:44 +0000 (15:15 -0700)]
Merge commit 'remotes/goog/eclair' into eclair-release
Scott Main [Tue, 1 Sep 2009 17:41:03 +0000 (10:41 -0700)]
am
a01ee1ea: docs only. my previous change to the list styles was the wrong solution. this fixes all prior problems with nested lists in OLs, ULs, and DLs
Merge commit '
a01ee1ea93cd2a4d876fcb5678392bbd277b6042' into eclair
* commit '
a01ee1ea93cd2a4d876fcb5678392bbd277b6042':
docs only.
Scott Main [Tue, 1 Sep 2009 17:36:55 +0000 (10:36 -0700)]
docs only.
my previous change to the list styles was the wrong solution.
this fixes all prior problems with nested lists in OLs, ULs, and DLs
The Android Open Source Project [Tue, 1 Sep 2009 15:36:24 +0000 (08:36 -0700)]
ERC63
The Android Open Source Project [Tue, 1 Sep 2009 15:36:13 +0000 (08:36 -0700)]
Merge commit 'remotes/goog/eclair' into eclair-release
Xavier Ducrohet [Mon, 31 Aug 2009 23:44:24 +0000 (16:44 -0700)]
Add camera feature files to the SDK system image.
Without this the system refuses to install applications that
requires the camera (like ApiDemos)
Change-Id: Ia13b6a10f4731bf23eea04e3210ad0b3ed557aa6
Anonymous Coward [Mon, 31 Aug 2009 17:53:49 +0000 (10:53 -0700)]
am
f9f9d4f3: Remove WebSearchProvider from build specs.
Merge commit '
f9f9d4f3c393537f9cab5e8cc59d241ad2279474' into eclair
* commit '
f9f9d4f3c393537f9cab5e8cc59d241ad2279474':
Remove WebSearchProvider from build specs.
Anonymous Coward [Mon, 31 Aug 2009 14:10:01 +0000 (10:10 -0400)]
Remove WebSearchProvider from build specs.
The Android Open Source Project [Mon, 31 Aug 2009 15:36:13 +0000 (08:36 -0700)]
ERC62
The Android Open Source Project [Mon, 31 Aug 2009 15:36:00 +0000 (08:36 -0700)]
Merge commit 'remotes/goog/eclair' into eclair-release
Android (Google) Code Review [Sun, 30 Aug 2009 20:44:22 +0000 (13:44 -0700)]
Merge change 23258 into eclair
* changes:
Add the ability to turn on proguard for java targets, and to call aapt to generate a rules file for proguard for stuff from the manifest and other resources that need to be kept.
Joe Onorato [Sun, 30 Aug 2009 20:39:24 +0000 (13:39 -0700)]
Add the ability to turn on proguard for java targets, and to call aapt
to generate a rules file for proguard for stuff from the manifest and
other resources that need to be kept.
Brett Chabot [Sat, 29 Aug 2009 23:44:39 +0000 (16:44 -0700)]
am
3c7c8a60: Merge change 22522 into donut
Merge commit '
3c7c8a60860f97ac4c7381bd6ed30a43864372da' into eclair
* commit '
3c7c8a60860f97ac4c7381bd6ed30a43864372da':
Add Gesture tests to CTS.
Android (Google) Code Review [Sat, 29 Aug 2009 23:42:25 +0000 (16:42 -0700)]
Merge change 22522 into donut
* changes:
Add Gesture tests to CTS.
The Android Open Source Project [Fri, 28 Aug 2009 21:05:01 +0000 (14:05 -0700)]
ERC59B
The Android Open Source Project [Fri, 28 Aug 2009 15:35:51 +0000 (08:35 -0700)]
ERC59
The Android Open Source Project [Fri, 28 Aug 2009 15:35:41 +0000 (08:35 -0700)]
Merge commit 'remotes/goog/eclair' into eclair-release
Daniel Sandler [Fri, 28 Aug 2009 14:00:12 +0000 (10:00 -0400)]
Introduce a default density ('mdpi') for all device builds.
This is done by appending "mdpi" (medium density or 160 dpi, which is what
we've been using so far on dream etc.) to PRODUCT_LOCALES if no other dpi is
found there. (PRODUCT_LOCALES is then sent as a configuration parameter to
aapt to determine which resources should be included in the build.)
With this change, each build will now include only one density of any given
asset. For example, if there exists
drawable-hdpi/foo.png
drawable-mdpi/foo.png
...then the build will include *only* drawable-mdpi/foo.png, unless the
density is overridden in the build's own device spec:
PRODUCT_LOCALES += hdpi
...in which case the build will include only drawable-hdpi/foo.png.
The Android Open Source Project [Fri, 28 Aug 2009 01:10:27 +0000 (18:10 -0700)]
ERC58C
The Android Open Source Project [Fri, 28 Aug 2009 01:10:14 +0000 (18:10 -0700)]
Merge commit 'remotes/goog/eclair' into eclair-release
Dirk Dougherty [Thu, 27 Aug 2009 23:45:47 +0000 (16:45 -0700)]
Doc changes for SDK update.
Update SDK toc template.
Doug Zongker [Thu, 27 Aug 2009 23:12:00 +0000 (16:12 -0700)]
remove bootloader assertions
These should be done by the device-specific module where necessary;
they aren't appropriate for all devices.
The Android Open Source Project [Thu, 27 Aug 2009 22:08:33 +0000 (15:08 -0700)]
ERC58B
The Android Open Source Project [Thu, 27 Aug 2009 15:36:10 +0000 (08:36 -0700)]
ERC58
The Android Open Source Project [Thu, 27 Aug 2009 15:35:55 +0000 (08:35 -0700)]
Merge commit 'remotes/goog/eclair' into eclair-release
Doug Zongker [Thu, 27 Aug 2009 06:22:05 +0000 (23:22 -0700)]
am
1b6d0a65: allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
Merge commit '
1b6d0a65fc62901f2c18d00c556bd5da50f35584' into eclair
* commit '
1b6d0a65fc62901f2c18d00c556bd5da50f35584':
allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
Doug Zongker [Thu, 27 Aug 2009 01:22:43 +0000 (18:22 -0700)]
allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
If a prebuilt specifies a LOCAL_CERTIFICATE, stick it in the
PACKAGES.* collection so that the predexopt process can work on the
file (which only works if the new .apk can be signed).
Doug Zongker [Wed, 26 Aug 2009 18:41:13 +0000 (11:41 -0700)]
am
4ac1ba61: fix typo in bash expression
Merge commit '
4ac1ba61075190fa9ced594c85285beff6293184' into eclair
* commit '
4ac1ba61075190fa9ced594c85285beff6293184':
fix typo in bash expression
Doug Zongker [Wed, 26 Aug 2009 16:37:07 +0000 (09:37 -0700)]
resolved conflicts for merge of
6dd2ae02 to eclair
Scott Main [Wed, 26 Aug 2009 16:29:28 +0000 (09:29 -0700)]
The Android Open Source Project [Wed, 26 Aug 2009 15:36:01 +0000 (08:36 -0700)]
ERC57
Doug Zongker [Wed, 26 Aug 2009 03:38:50 +0000 (20:38 -0700)]
fix typo in bash expression
Fortunately the error doesn't change the value of the expression
(since undefined variables are treated as 0 inside "$((...))").
Doug Zongker [Wed, 26 Aug 2009 00:23:57 +0000 (17:23 -0700)]
turn down allowed image size
yaffs appears to reserve 5 blocks on the partition for itself.
Account for this when computing the maximum allowable image size.
Android (Google) Code Review [Tue, 25 Aug 2009 23:33:12 +0000 (16:33 -0700)]
Merge change 22524 into donut
* changes:
docs only. fix api level highlighting for the treeview navigation.
The Android Open Source Project [Tue, 25 Aug 2009 15:34:35 +0000 (08:34 -0700)]
ERC56
The Android Open Source Project [Tue, 25 Aug 2009 01:49:05 +0000 (18:49 -0700)]
ERC55D
The Android Open Source Project [Tue, 25 Aug 2009 01:48:54 +0000 (18:48 -0700)]
Merge commit 'remotes/goog/eclair' into eclair-release
Scott Main [Tue, 25 Aug 2009 00:33:06 +0000 (17:33 -0700)]
docs only.
fix api level highlighting for the treeview navigation.
Brett Chabot [Tue, 25 Aug 2009 00:30:41 +0000 (17:30 -0700)]
Add Gesture tests to CTS.
Phil Dubach [Mon, 24 Aug 2009 22:51:51 +0000 (15:51 -0700)]
am
793817ba: CTS: Add missing make dependencies for application security tests
Merge commit '
793817baa1455c410311d79ef6f44cac1c26be9f' into eclair
* commit '
793817baa1455c410311d79ef6f44cac1c26be9f':
CTS: Add missing make dependencies for application security tests
Phil Dubach [Mon, 24 Aug 2009 21:18:15 +0000 (14:18 -0700)]
CTS: Add missing make dependencies for application security tests
Change-Id: I4d069b18b0da5f49ca9bb377d04732b8222ac137
Phil Dubach [Mon, 24 Aug 2009 20:39:32 +0000 (13:39 -0700)]
am
3b7521b5: CTS: Add application security tests to makefile
Merge commit '
3b7521b524de694cb9da277fd1d7493fc41aa0f3' into eclair
* commit '
3b7521b524de694cb9da277fd1d7493fc41aa0f3':
CTS: Add application security tests to makefile
Doug Zongker [Mon, 24 Aug 2009 20:39:30 +0000 (13:39 -0700)]
am
8fead691: Merge change 22448 into donut
Merge commit '
8fead6912ed3f04867974631935435a887ed889d' into eclair
* commit '
8fead6912ed3f04867974631935435a887ed889d':
incremental OTAs should remove /system/recovery.img
Phil Dubach [Wed, 19 Aug 2009 23:26:40 +0000 (16:26 -0700)]
CTS: Add application security tests to makefile
Change-Id: I51291d338cca88fed68247efbecbaf747306c6b7
The Android Open Source Project [Mon, 24 Aug 2009 17:40:00 +0000 (10:40 -0700)]
ERC55C
The Android Open Source Project [Mon, 24 Aug 2009 17:39:52 +0000 (10:39 -0700)]
Merge commit 'remotes/goog/eclair' into eclair-release
Android (Google) Code Review [Mon, 24 Aug 2009 17:36:06 +0000 (10:36 -0700)]
Merge change 22448 into donut
* changes:
incremental OTAs should remove /system/recovery.img
The Android Open Source Project [Mon, 24 Aug 2009 17:34:20 +0000 (10:34 -0700)]
ERC55B
Doug Zongker [Mon, 24 Aug 2009 17:24:32 +0000 (10:24 -0700)]
incremental OTAs should remove /system/recovery.img
This file has been replaced by the recovery_from_boot.p patch file,
but needs to be removed from existing devices if it exists.
The Android Open Source Project [Mon, 24 Aug 2009 15:35:46 +0000 (08:35 -0700)]
ERC55
The Android Open Source Project [Mon, 24 Aug 2009 15:35:35 +0000 (08:35 -0700)]
Merge commit 'remotes/goog/eclair' into eclair-release
Scott Su [Mon, 24 Aug 2009 05:44:05 +0000 (13:44 +0800)]
Remove frameworks/base/im from build path
Scott Main [Sat, 22 Aug 2009 14:44:20 +0000 (07:44 -0700)]
Scott Main [Sat, 22 Aug 2009 14:44:16 +0000 (07:44 -0700)]
Phil Dubach [Sat, 22 Aug 2009 14:43:37 +0000 (07:43 -0700)]
am
7c463e4b: Merge change 21778 into donut
Merge commit '
7c463e4b0565f752bc06feb98962ab1536937aa1' into eclair
* commit '
7c463e4b0565f752bc06feb98962ab1536937aa1':
CTS: Enable Python description/plan generator
Android (Google) Code Review [Fri, 21 Aug 2009 23:38:35 +0000 (16:38 -0700)]
Merge change 22354 into donut
* changes:
docs only. add donut image for homepage announcement.
Scott Main [Fri, 21 Aug 2009 23:37:09 +0000 (16:37 -0700)]
docs only.
add donut image for homepage announcement.
The Android Open Source Project [Fri, 21 Aug 2009 23:30:15 +0000 (16:30 -0700)]
ERC52C
The Android Open Source Project [Fri, 21 Aug 2009 23:17:58 +0000 (16:17 -0700)]
ERC52B
Android (Google) Code Review [Fri, 21 Aug 2009 23:12:25 +0000 (16:12 -0700)]
Merge change 22348 into donut
* changes:
docs only. remove preliminary watermak
Scott Main [Fri, 21 Aug 2009 23:11:02 +0000 (16:11 -0700)]
docs only.
remove preliminary watermak
Android (Google) Code Review [Fri, 21 Aug 2009 21:41:40 +0000 (14:41 -0700)]
Merge change 21778 into donut
* changes:
CTS: Enable Python description/plan generator
The Android Open Source Project [Fri, 21 Aug 2009 14:05:52 +0000 (07:05 -0700)]
ERC52
The Android Open Source Project [Fri, 21 Aug 2009 14:05:41 +0000 (07:05 -0700)]
Merge commit 'remotes/goog/eclair' into eclair-release
Jeff Hamilton [Fri, 21 Aug 2009 05:38:17 +0000 (00:38 -0500)]
Prefer ContactsProvider over GoogleContactsProvider.
Doug Zongker [Fri, 21 Aug 2009 01:18:29 +0000 (18:18 -0700)]
am
e05628cc: fix signing user builds
Merge commit '
e05628cc8df4ec4b69befa9652d81eb81f0ab008' into eclair
* commit '
e05628cc8df4ec4b69befa9652d81eb81f0ab008':
fix signing user builds
Doug Zongker [Fri, 21 Aug 2009 00:38:42 +0000 (17:38 -0700)]
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.
The Android Open Source Project [Thu, 20 Aug 2009 19:11:53 +0000 (12:11 -0700)]
ERC51B
The Android Open Source Project [Thu, 20 Aug 2009 19:11:41 +0000 (12:11 -0700)]
Merge commit 'remotes/goog/eclair' into eclair-release
Dirk Dougherty [Thu, 20 Aug 2009 17:36:47 +0000 (10:36 -0700)]
am
6f7ba2dc: Merge change 20234 into donut
Merge commit '
6f7ba2dce2c112eb4be33dbad54751d55ddd2276' into eclair
* commit '
6f7ba2dce2c112eb4be33dbad54751d55ddd2276':
Remove extraneous quotation mark in template file
Android (Google) Code Review [Thu, 20 Aug 2009 17:33:11 +0000 (10:33 -0700)]
Merge change 20234 into donut
* changes:
Remove extraneous quotation mark in template file
The Android Open Source Project [Thu, 20 Aug 2009 14:06:12 +0000 (07:06 -0700)]
ERC51
The Android Open Source Project [Thu, 20 Aug 2009 14:05:58 +0000 (07:05 -0700)]
Merge commit 'remotes/goog/eclair' into eclair-release
Andrei Popescu [Thu, 20 Aug 2009 11:42:30 +0000 (12:42 +0100)]
Clean libwebcore after new WebKit merge
Phil Dubach [Fri, 14 Aug 2009 20:48:34 +0000 (13:48 -0700)]
CTS: Enable Python description/plan generator
This enables the new description/plan generator added in change
21366.
Android (Google) Code Review [Wed, 19 Aug 2009 21:46:27 +0000 (14:46 -0700)]
Merge change 21912 into eclair
* changes:
Bump platform version to 4.
Raphael [Wed, 19 Aug 2009 21:06:33 +0000 (14:06 -0700)]
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.
Android (Google) Code Review [Wed, 19 Aug 2009 19:11:38 +0000 (12:11 -0700)]
Merge change 21783 into eclair
* changes:
Windows: Fix platform build.
Raphael [Tue, 18 Aug 2009 21:43:32 +0000 (14:43 -0700)]
Windows: Fix platform build.
Scott Main [Wed, 19 Aug 2009 18:05:04 +0000 (11:05 -0700)]
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.
Dianne Hackborn [Wed, 19 Aug 2009 18:00:21 +0000 (11:00 -0700)]
Bump platform version to 4.
Not sure why this didn't get integrated from Donut.
The Android Open Source Project [Wed, 19 Aug 2009 14:06:21 +0000 (07:06 -0700)]
ERC50
Chih-Chung Chang [Wed, 19 Aug 2009 10:12:32 +0000 (18:12 +0800)]
Need this to update system properties (for change 21876).
Scott Main [Wed, 19 Aug 2009 02:00:11 +0000 (19:00 -0700)]
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.
The Android Open Source Project [Tue, 18 Aug 2009 14:05:53 +0000 (07:05 -0700)]
ERC49