3535 Commits

Author SHA1 Message Date
Dianne Hackborn
0250416a8f am 78c951b2: Merge change 23704 into eclair
Merge commit '78c951b286ad6fc5300e2d30a624b7e9963202e7' into eclair-plus-aosp

* commit '78c951b286ad6fc5300e2d30a624b7e9963202e7':
  Fiddle system boot ordering.
2009-09-02 17:57:49 -07:00
Android (Google) Code Review
78c951b286 Merge change 23704 into eclair
* changes:
  Fiddle system boot ordering.
2009-09-02 17:55:35 -07:00
Christian Sonntag
a9ef0e8891 am ea6fca82: fix doc
Merge commit 'ea6fca8231c94064917e40dea23be8df50930cf9' into eclair-plus-aosp

* commit 'ea6fca8231c94064917e40dea23be8df50930cf9':
  fix doc
2009-09-02 17:40:51 -07:00
Dianne Hackborn
a34f1ad7c3 Fiddle system boot ordering.
This makes the system a little more careful to not start third party
code until it is ready to.

Also fix a little bug in SyncManager that would cause it to crash
during boot if sync was in a failure state.

Change-Id: Ib2d287d8441d155d393fe740a5f98690895fd358
2009-09-02 17:39:54 -07:00
Christian Sonntag
ea6fca8231 fix doc 2009-09-02 17:34:48 -07:00
Christian Sonntag
6564e20809 am 75f1d43b: Merge change 23738 into eclair
Merge commit '75f1d43b64cbf4b68ad62919a0c58907933ccd59' into eclair-plus-aosp

* commit '75f1d43b64cbf4b68ad62919a0c58907933ccd59':
  fix doc
2009-09-02 17:27:36 -07:00
Android (Google) Code Review
75f1d43b64 Merge change 23738 into eclair
* changes:
  fix doc
2009-09-02 17:25:35 -07:00
Christian Sonntag
a9b1a7f6c0 fix doc 2009-09-02 17:23:56 -07:00
Fred Quintana
61f87bcbd6 am 14de0880: Merge change 23698 into eclair
Merge commit '14de0880dd7b716f39b822917e874ca5e579ff37' into eclair-plus-aosp

* commit '14de0880dd7b716f39b822917e874ca5e579ff37':
  suppress syncs until boot is complete
2009-09-02 17:07:35 -07:00
Android (Google) Code Review
14de0880dd Merge change 23698 into eclair
* changes:
  suppress syncs until boot is complete
2009-09-02 16:50:13 -07:00
Leon Scroggins
cf4fe3efaa am f6ca7fab: Merge change 23690 into eclair
Merge commit 'f6ca7fab5043e1c3e834c15b4e674ae0c5c37d0d' into eclair-plus-aosp

* commit 'f6ca7fab5043e1c3e834c15b4e674ae0c5c37d0d':
  Prevent a crash when webkit changes the selection.
2009-09-02 16:47:20 -07:00
Grace Kloba
449d42c9ac am 010bed74: Merge change 23723 into eclair
Merge commit '010bed7419e96f5310be25d9317405d360f90b9c' into eclair-plus-aosp

* commit '010bed7419e96f5310be25d9317405d360f90b9c':
  Get drawable directory for the platform buttons.
2009-09-02 16:47:14 -07:00
Android (Google) Code Review
f6ca7fab50 Merge change 23690 into eclair
* changes:
  Prevent a crash when webkit changes the selection.
2009-09-02 16:45:33 -07:00
Android (Google) Code Review
010bed7419 Merge change 23723 into eclair
* changes:
  Get drawable directory for the platform buttons.
2009-09-02 16:44:52 -07:00
Leon Scroggins
ef92e7a606 Prevent a crash when webkit changes the selection.
Partial fix for http://b/issue?id=2081673
This prevents a crash.  However, if the user continues typing
into the textfield, the selection is incorrect.  The real solution
(forthcoming), will make sure that the WebTextView's text gets
updated when webkit updates.

Change-Id: Ic832ec48fd4236c8116c5cbda1467677ad731feb
2009-09-02 19:31:33 -04:00
Suchi Amalapurapu
743a7495ab am 23db1731: Merge change 23717 into eclair
Merge commit '23db17314d32b56727123d21e3ca899a441c2a60' into eclair-plus-aosp

* commit '23db17314d32b56727123d21e3ca899a441c2a60':
  Make new attribute EXTRA_CHANGED_COMPONENT_NAME in
2009-09-02 16:26:48 -07:00
Android (Google) Code Review
23db17314d Merge change 23717 into eclair
* changes:
  Make new attribute EXTRA_CHANGED_COMPONENT_NAME in broadcast intent ACTION_PACKAGE_CHANGED public so that apps like launcher can find out the changed component name when loading changes made in components.
2009-09-02 16:25:01 -07:00
Grace Kloba
83031581d6 Get drawable directory for the platform buttons.
Fix http://b/issue?id=2086818
2009-09-02 16:21:42 -07:00
Suchi Amalapurapu
32f589046b Make new attribute EXTRA_CHANGED_COMPONENT_NAME in
broadcast intent ACTION_PACKAGE_CHANGED public so that
apps like launcher can find out the changed component name
when loading changes made in components.
2009-09-02 16:11:14 -07:00
Nick Pelly
a457a5dbb9 am d4c1baf9: Merge change 23646 into eclair
Merge commit 'd4c1baf93708ad4e90c556e6041a498dbffaaba0' into eclair-plus-aosp

* commit 'd4c1baf93708ad4e90c556e6041a498dbffaaba0':
  Immediately destroy BluetoothSocket's on close().
2009-09-02 16:03:31 -07:00
Android (Google) Code Review
d4c1baf937 Merge change 23646 into eclair
* changes:
  Immediately destroy BluetoothSocket's on close().
2009-09-02 16:01:15 -07:00
Fred Quintana
4f9cfc5c52 suppress syncs until boot is complete 2009-09-02 15:20:23 -07:00
Cedric Beust
7def92e2f1 am 04e1faf0: Merge change 23669 into eclair
Merge commit '04e1faf0f030ddb360180289fb798adbb3348dd4' into eclair-plus-aosp

* commit '04e1faf0f030ddb360180289fb798adbb3348dd4':
  Cleaner way to fix the -1 count problem (and removing an Eclipse warning along the way).
2009-09-02 13:36:26 -07:00
Android (Google) Code Review
04e1faf0f0 Merge change 23669 into eclair
* changes:
  Cleaner way to fix the -1 count problem (and removing an Eclipse warning along the way).
2009-09-02 13:33:43 -07:00
Cedric Beust
a010ef4d7e Cleaner way to fix the -1 count problem (and removing an Eclipse warning along the way).
Change-Id: I154e27f615932bfcc08993aa361a6d2ffbc51d74
2009-09-02 13:24:52 -07:00
Cedric Beust
286996b26e am 682e30a8: Merge change 23667 into eclair
Merge commit '682e30a894bfe9600f5c216c008ec4fe26c3b954' into eclair-plus-aosp

* commit '682e30a894bfe9600f5c216c008ec4fe26c3b954':
  Fix the -1 unread count bug.
2009-09-02 13:18:41 -07:00
Android (Google) Code Review
682e30a894 Merge change 23667 into eclair
* changes:
  Fix the -1 unread count bug.
2009-09-02 13:15:52 -07:00
Cedric Beust
6f4a8a5861 Fix the -1 unread count bug.
Change-Id: I8b77ad3457504872928c1065d54f50c0618025b5
2009-09-02 13:12:26 -07:00
jsh
ffaa502e78 am 8ecd2aec: Merge change 23548 into eclair
Merge commit '8ecd2aecf66010e974d9125f40282168be76b440' into eclair-plus-aosp

* commit '8ecd2aecf66010e974d9125f40282168be76b440':
  Fix some sign in errors.
2009-09-02 13:05:05 -07:00
Android (Google) Code Review
8ecd2aecf6 Merge change 23548 into eclair
* changes:
  Fix some sign in errors.
2009-09-02 13:01:59 -07:00
Jeff Hamilton
baccdec934 am 0a299858: Merge change 23643 into eclair
Merge commit '0a29985895069cc7a34d5511a292d779eae36426' into eclair-plus-aosp

* commit '0a29985895069cc7a34d5511a292d779eae36426':
  Don't crash when a user taps on a fast track trigger that isn't hooked up to a contact.
2009-09-02 12:40:44 -07:00
Suchi Amalapurapu
2d18a24c93 am beea2690: Merge change 23323 into eclair
Merge commit 'beea2690008eaea5a901ff3ae748b01893e24e1b' into eclair-plus-aosp

* commit 'beea2690008eaea5a901ff3ae748b01893e24e1b':
  For intent ACTION_PACKAGE_CHANGED, there could be a lot of broadcasts related to enabling/disabling
2009-09-02 12:40:39 -07:00
Android (Google) Code Review
0a29985895 Merge change 23643 into eclair
* changes:
  Don't crash when a user taps on a fast track trigger that isn't hooked up to a contact.
2009-09-02 12:38:03 -07:00
Android (Google) Code Review
beea269000 Merge change 23323 into eclair
* changes:
      For intent ACTION_PACKAGE_CHANGED, there could be a lot of broadcasts related to enabling/disabling     components by apps which could result in thrashing on the PackageManager. For apps that     do not want to be restarted when such a broadcast is sent, we can just aggregate these broadcasts and     handle them at one go.     Changes include:     New structure to hold pending broadcasts by class name. If a component is enabled or disabled frequently     aggregate component enabled/disabled settings in this structure in a 10 second window and then     send out the accumulated list of broadcasts to the ActivityManager.     A new Handler implementation handles this message     Add new attribute name EXTRA_CHANGED_COMPONENT_NAME in broadcast intent Intent.ACTION_PACKAGE_CHANGED for     additional information for apps like Launcher.     Rename a couple of parameters, the names were too jarring.
2009-09-02 12:37:56 -07:00
Suchi Amalapurapu
0214e9475f For intent ACTION_PACKAGE_CHANGED, there could be a lot of broadcasts related to enabling/disabling
components by apps which could result in thrashing on the PackageManager. For apps that
    do not want to be restarted when such a broadcast is sent, we can just aggregate these broadcasts and
    handle them at one go.
    Changes include:
    New structure to hold pending broadcasts by class name. If a component is enabled or disabled frequently
    aggregate component enabled/disabled settings in this structure in a 10 second window and then
    send out the accumulated list of broadcasts to the ActivityManager.
    A new Handler implementation handles this message
    Add new attribute name EXTRA_CHANGED_COMPONENT_NAME in broadcast intent Intent.ACTION_PACKAGE_CHANGED for
    additional information for apps like Launcher.
    Rename a couple of parameters, the names were too jarring.
2009-09-02 12:32:32 -07:00
Jeff Hamilton
b623a7c953 Don't crash when a user taps on a fast track trigger that isn't hooked up to a contact. 2009-09-02 14:30:55 -05:00
Nick Pelly
71c3c7806a Immediately destroy BluetoothSocket's on close().
Unfortunatley, shutdown() on the underlying fd does not actually stop a
listening socket from listening. You need to call close() on the fd to
do this. There is no way around it.

So this means the Java BluetoothSocket code has to call destroyNative() during
BluetoothSocket.close().

Since native methods cannot be called after destroyNative(), add a ReadWrite
lock and mClosed field to protect access to native methods.

This fixes the "resource busy" error when Bluetooth OPP and Bluetooth PBAP
tried to resume listening after turning BT off and then on.
2009-09-02 11:51:35 -07:00
Eric Fischer
7a797a02af am 66c70e13: Merge change 23529 into eclair
Merge commit '66c70e13d9f39cf82df8542fe53f2049d3f2062e' into eclair-plus-aosp

* commit '66c70e13d9f39cf82df8542fe53f2049d3f2062e':
  Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.
2009-09-02 11:19:19 -07:00
Android (Google) Code Review
66c70e13d9 Merge change 23529 into eclair
* changes:
  Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.
2009-09-02 11:17:18 -07:00
Christian Sonntag
6fea727c4c am 82b43d4f: Merge change 23631 into eclair
Merge commit '82b43d4f4ea56745be1ce9bc3b3a5e18e6222ac9' into eclair-plus-aosp

* commit '82b43d4f4ea56745be1ce9bc3b3a5e18e6222ac9':
  Add APANIC kernel logging to CheckinService.
2009-09-02 09:44:39 -07:00
Android (Google) Code Review
82b43d4f4e Merge change 23631 into eclair
* changes:
  Add APANIC kernel logging to CheckinService. we keep book and only read a particular file once and send it to the server.
2009-09-02 09:41:14 -07:00
Christian Sonntag
62d95ead34 Add APANIC kernel logging to CheckinService.
we keep book and only read a particular file once and send it to the server.

The files are:

Ramconsole Driver (Dream/Sapphire):

/data/dontpanic/last_kmsg

Apanic Driver (Sholes/all future designs):

/data/dontpanic/apanic_console
/data/dontpanic/apanic_threads
2009-09-02 09:28:37 -07:00
Dmitri Plotnikov
db7dde6bd3 am bb54f93f: Merge change 23527 into eclair
Merge commit 'bb54f93ff66f382dc706b9fff508d386e046fdc2' into eclair-plus-aosp

* commit 'bb54f93ff66f382dc706b9fff508d386e046fdc2':
  Adding a convenience method to resolve contact lookup URI to a regular content URI
2009-09-02 08:42:46 -07:00
Android (Google) Code Review
bb54f93ff6 Merge change 23527 into eclair
* changes:
  Adding a convenience method to resolve contact lookup URI to a regular content URI
2009-09-02 08:38:32 -07:00
Wu-cheng Li
35412cf5ab am 14d8e6e5: Merge change 23609 into eclair
Merge commit '14d8e6e5d5503fe420bb3276d367cba1bfba03f9' into eclair-plus-aosp

* commit '14d8e6e5d5503fe420bb3276d367cba1bfba03f9':
  Fix SDK build breakage.
2009-09-02 00:15:43 -07:00
Wu-cheng Li
1c632933d9 Fix SDK build breakage. 2009-09-02 14:35:08 +08:00
Wu-cheng Li
eb05398fcc am 9b6a8ab8: Add camera parameters constants and methods.
Merge commit '9b6a8ab8221f2df20c32711b0f1e4f301165fac2' into eclair-plus-aosp

* commit '9b6a8ab8221f2df20c32711b0f1e4f301165fac2':
  Add camera parameters constants and methods.
2009-09-01 22:01:00 -07:00
Wu-cheng Li
9b6a8ab822 Add camera parameters constants and methods. 2009-09-02 12:45:23 +08:00
Christopher Tate
9073dc69b1 am 9756a70b: Merge change 23582 into eclair
Merge commit '9756a70bd92fb844d2fd8346cc4bb6c8bb768c4b' into eclair-plus-aosp

* commit '9756a70bd92fb844d2fd8346cc4bb6c8bb768c4b':
  Expand apps' control over the settings restore process
2009-09-01 21:02:33 -07:00
Christopher Tate
5e1ab335e6 Expand apps' control over the settings restore process
Applications can now specify two more aspects of the restore process:  whether
they need to run with their own custom Application subclass rather than being
launched in the usual restricted mode during restore, and whether it's okay for
the backup manager to kill the app process once restore has completed.  The new
manifest attributes for these are, respectively, android:restoreNeedsApplication
and android:killAfterRestore.

If unspecified in the manifest, restoreNeedsApplication is false, and
killAfterRestore is true.

In order to support kill-after-restore cleanly, this change also adds a new
system-process-only interface to the Activity Manager, which will schedule a
"commit suicide" event on the target app's main thread looper.

The framework backup agents have been given the appropriate new backup
attributes as well.
2009-09-01 20:59:36 -07:00