17930 Commits

Author SHA1 Message Date
Joe Onorato
f1dd37ac28 Merge "Fix 1667521 - system process crash after bad notification" 2010-02-03 20:25:43 -08:00
Joe Onorato
68065e0a19 Fix 1667521 - system process crash after bad notification
The steps to reproduce this were kind of interesting.  You needed to have
a notification with a bogus RemoteViews in the first position in the list,
and then have another notification come in with an earlier timestampe.  In
that case, it would get a bad index for the new (not bogus) view that was
being added.
2010-02-03 20:21:41 -08:00
Dianne Hackborn
fa6bc84e01 Merge "Implement system data migration support." 2010-02-03 18:18:56 -08:00
Adam Powell
b039fd4c4a Merge "Fixed an overscrolling bug in AbsListView with a root in OverScroller." 2010-02-03 17:05:53 -08:00
Andreas Huber
5258919fab Merge "Defer creating the video renderer until we see the first video frame." 2010-02-03 16:45:57 -08:00
Adam Powell
eb6b1fa7b8 Fixed an overscrolling bug in AbsListView with a root in OverScroller. 2010-02-03 16:41:07 -08:00
Scott Main
d9ebf24829 Merge "Merge commit '2f7b69aa' into manualmerge" 2010-02-03 16:39:26 -08:00
Eric Fischer
75e15985bc Merge "Fix Czech lock screen date format." 2010-02-03 16:38:49 -08:00
Scott Main
952e39578d Merge commit '2f7b69aa' into manualmerge
Conflicts:
	docs/html/guide/topics/ui/themes.jd
2010-02-03 16:37:03 -08:00
Scott Main
2f7b69aab9 am 98a9fc0a: Merge "docs: revise the Style and Themes document to improve the clarity of the concepts and expand the available information" into eclair
Merge commit '98a9fc0a0025a3df7b36f7752fc330eba8810603' into eclair-plus-aosp

* commit '98a9fc0a0025a3df7b36f7752fc330eba8810603':
  docs: revise the Style and Themes document to improve the
2010-02-03 16:18:17 -08:00
Scott Main
98a9fc0a00 Merge "docs: revise the Style and Themes document to improve the clarity of the concepts and expand the available information" into eclair 2010-02-03 16:11:41 -08:00
Andreas Huber
7085b684c6 Defer creating the video renderer until we see the first video frame.
This avoids having to instantiate the renderer twice in case the video decoder sends a format change before the first frame.

related-to-bug: 2375037
2010-02-03 16:02:02 -08:00
Dianne Hackborn
b858dfda50 Implement system data migration support.
This adds three new features:

- <original-package android:name="com.foo" /> manifest tag.
  This allows an .apk to specify another package it originally came from,
  propagating all state and data from the old to new package.

- <adopt-permissions android:name="com.foo" /> manifest tag.
  In some more complicated cases, a new .apk may be a combination
  of multiple older .apks that each declared their own permissions.
  This allows you to propagate the permissions from these other
  .apks into the new one.

- A new system/etc/updatecmds directory.
  You can place files here which describe data files to move from
  one package to another.  (See below for details.)

Also in this change: we now clean up the data directories of
.apks that disappear from the system image, and some improvements
to logging and reporting error messages.

A typical file in the updatecmds directory looks like this:

-------
com.google.android.gsf:com.google.android.providers.talk
    databases/talk.db
com.google.android.gsf:com.google.android.googleapps
    databases/gls.db
-------

This says that for com.google.android.sfs, there are two packages to
move files from:

From com.google.android.providers.talk, the file databases/talk.db.
From com.google.android.googleapps, the file databases/gls.db

As part of moving the file, its owner will be changed from the old
package to whoever is the owner of the new package's data directory.

If those two files had existed, after booting you would now have the
files:

/data/data/com.google.android.gsf/databases/talk.db
/data/data/com.google.android.gsf/databases/gls.db

Note that all three of these facilities assume that the older .apk
is completely removed from the newer system.  The WILL NOT work
correctly if the older .apk still remains.
2010-02-03 15:42:02 -08:00
Andreas Huber
bca1c65fe4 Merge "Previous change broke A/V sync, this is a better change to eliminate negative media positions." 2010-02-03 15:41:23 -08:00
Andreas Huber
065f69ef53 Previous change broke A/V sync, this is a better change to eliminate negative media positions.
related-to-bug: 2414900
2010-02-03 15:35:59 -08:00
Chris Tate
348f7b9048 Merge "Add auto-restore setting and Backup Manager awareness thereof" 2010-02-03 15:35:28 -08:00
Christopher Tate
cce9da5dc3 Add auto-restore setting and Backup Manager awareness thereof
This setting, like BACKUP_ENABLE, should never be set directly in the secure
settings database.  Instead, it should be manipulated through the new IBackupManager
method setAutoRestore(boolean).

Change-Id: I5c3226ca85b6148bb756d753d7f9e4ea76e878c4
2010-02-03 15:33:52 -08:00
Doug Zongker
8c59ec53dc Merge "remove android.webkit.HttpDateTime, again" 2010-02-03 15:15:02 -08:00
San Mehat
a15caf853b Merge "NativeDaemonConnector: Improve NativeDaemonException reporting to include the actual error response" 2010-02-03 15:09:53 -08:00
Eric Fischer
574ee3905b Fix Czech lock screen date format.
Bug 2291064
2010-02-03 15:08:56 -08:00
Scott Main
4d5770904c docs: revise the Style and Themes document to improve the
clarity of the concepts and expand the available information
2010-02-03 14:50:15 -08:00
San Mehat
ec4caa0f54 NativeDaemonConnector: Improve NativeDaemonException reporting to include the actual error response
Signed-off-by: San Mehat <san@google.com>
2010-02-03 14:37:43 -08:00
Doug Zongker
45a9a14006 remove android.webkit.HttpDateTime, again
Remove this class, again, and change the webkit uses of it to use the
one in android-common.  Remove class from preloaded-classes as well.

Change-Id: Ic0d4835e77180d299bc2c22b7c8780861b4781ee
2010-02-03 13:52:18 -08:00
Andreas Huber
70d10c0156 Fix a deadlock caused by the AudioPlayer notifying the observer that the stream had ended at the same time the observer was shutting down the AudioPlayer.
related-to-bug: 2414536
2010-02-03 13:24:26 -08:00
Doug Zongker
3c4a1ebc19 Merge "undo "move HttpDateTime from android.webkit to android-common jar"" 2010-02-03 12:57:54 -08:00
Doug Zongker
e4a74ea0ae undo "move HttpDateTime from android.webkit to android-common jar"
This restores this class to android.webkit, but leaves a copy in
android-common while I figure out how to move it correctly.

This reverts commit 7ad12a5f44253dc535f9a25ceb029579b40c43b1.

Change-Id: I1d0a3efe34764058b979c6987e6e774f64d02b8c
2010-02-03 12:56:16 -08:00
Bjorn Bringert
daea589620 Merge "Copy ic_menu_search.png to ic_search_category_default.png" 2010-02-03 12:52:21 -08:00
Daisuke Miyakawa
8f198c4bdd Merge "Honor '+' in phone export in vCard." 2010-02-03 12:44:39 -08:00
Daisuke Miyakawa
900731de0c Honor '+' in phone export in vCard.
Currently no test because of temporal reason. I'll do in the near future...

Bug: 2417138
2010-02-03 12:42:26 -08:00
Megha Joshi
1d91f2e416 am b299f802: am 9f4cfc3a: Merge "Screenshots for sample syncadapter." into eclair
Merge commit 'b299f802b2dea19b003a6724d53ecff1b763bab0'

* commit 'b299f802b2dea19b003a6724d53ecff1b763bab0':
  Screenshots for sample syncadapter.
2010-02-03 12:34:53 -08:00
Megha Joshi
b299f802b2 am 9f4cfc3a: Merge "Screenshots for sample syncadapter." into eclair
Merge commit '9f4cfc3afcdf9f7be096b3243bfc15b9346b8434' into eclair-plus-aosp

* commit '9f4cfc3afcdf9f7be096b3243bfc15b9346b8434':
  Screenshots for sample syncadapter.
2010-02-03 12:29:19 -08:00
Megha Joshi
9f4cfc3afc Merge "Screenshots for sample syncadapter." into eclair 2010-02-03 12:24:20 -08:00
Mathias Agopian
e304bdd5ee fix [2133133] Software OpenGL ES Lighting is buggy (GL Gears washed out bug)
A typo caused GL_AMBIENT_AND_DIFFUSE to only set the the ambient color.

Fix another typo which caused the viewer position to be wrong for
specular highlights.

Switch back to eye-space lighting, since there are still some issues
with some demos (San Angeles in particular).
2010-02-03 12:13:15 -08:00
Elliott Hughes
ecf04ec19a Merge "Remove "StringTest.java"." 2010-02-03 12:05:40 -08:00
Mike Chan
8321eb377f Merge "BatteryStatsImpl: initalize audio timer" 2010-02-03 12:00:39 -08:00
Elliott Hughes
809cf4481f Remove "StringTest.java".
This only tests stuff that's already better tested in dalvik/libcore, plus
private ICU API (RuleBasedNumberFormat) we'd like to remove, and that this
is the only caller of.
2010-02-03 11:33:47 -08:00
Adam Powell
732ebb1bc3 Fixed a regression in View.cancelLongPress 2010-02-03 11:31:10 -08:00
Megha Joshi
021a90dbaa Screenshots for sample syncadapter. 2010-02-03 11:21:45 -08:00
Doug Zongker
1fdaab2778 Merge "move HttpDateTime from android.webkit to android-common jar" 2010-02-03 11:21:27 -08:00
Doug Zongker
7ad12a5f44 move HttpDateTime from android.webkit to android-common jar
Some to-be-unbundled classes want to use HttpDateTime as well.

Change-Id: I40a001970682f6fbd4d9cd3546bd3f63ebfbe89b
2010-02-03 11:14:29 -08:00
Adam Powell
378a1488bb Merge "Javadoc fixes to ScaleGestureDetector for SDK builds" 2010-02-03 11:07:42 -08:00
Marco Nelissen
499cc1742a Merge "Fix fastscroll thumb" 2010-02-03 11:05:46 -08:00
Marco Nelissen
cd3e4ad4fb Fix fastscroll thumb 2010-02-03 11:04:58 -08:00
Doug Zongker
9cf1a5a0c7 Merge "use device serial number to seed RNG for generating ANDROID_ID" 2010-02-03 11:03:18 -08:00
Adam Powell
ab905c87b7 Javadoc fixes to ScaleGestureDetector for SDK builds 2010-02-03 11:01:58 -08:00
Barry Hayes
6511fe9c9d Merge "Add a "dalvik.vm.gc.overwritefree" property. When set to "true", the VM will be given the "-Xgc:overwritefree" flag, and the GC will clobber the memory of freed objects." 2010-02-03 10:58:18 -08:00
Doug Zongker
4f8ff39c1e use device serial number to seed RNG for generating ANDROID_ID
Change-Id: I1bcc55f1309cb908803bc42084846a046041eda6
2010-02-03 10:48:22 -08:00
Marco Nelissen
d5bb7ef77e Merge "Make the fastscroll thumb tell the parent to not intercept touch events, to keep the list from moving sideways in a "workspace" environment. Fixes one of the issues listed in bug 2374212" 2010-02-03 10:45:51 -08:00
Marco Nelissen
d43fe07852 Make the fastscroll thumb tell the parent to not intercept touch events,
to keep the list from moving sideways in a "workspace" environment.
Fixes one of the issues listed in bug 2374212
2010-02-03 10:42:33 -08:00
Doug Zongker
2c355e26e9 Merge "expose bootloader & radio versions, hardware string in API" 2010-02-03 10:38:09 -08:00