3657 Commits

Author SHA1 Message Date
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
Tammo Spalink
7e207afd49 Reject (NAK) CDMA SMS with unknown teleservice ids.
Addresses issue:
http://buganizer/issue?id=2066191

Change-Id: I56124379534bf19f128b6228749c7ee2ef455fed
2009-09-02 14:25:38 +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
Jaikumar Ganesh
a457424bfb am c937b5ce: Merge change 23463 into eclair
Merge commit 'c937b5ce4ff2f39fd9c60f718f98550a932b62f0' into eclair-plus-aosp

* commit 'c937b5ce4ff2f39fd9c60f718f98550a932b62f0':
  Wait for HCI to come up if getting the adapter path fails.
2009-09-01 19:20:44 -07:00
Android (Google) Code Review
c937b5ce4f Merge change 23463 into eclair
* changes:
  Wait for HCI to come up if getting the adapter path fails.
2009-09-01 19:19:47 -07:00
Jaikumar Ganesh
176c3d64a7 Wait for HCI to come up if getting the adapter path fails. 2009-09-01 19:17:02 -07:00
Fred Quintana
d862c3ccdb am 04f6da35: Merge change 23376 into eclair
Merge commit '04f6da353d4e79f49ba1d4897ed617e91acc3f77' into eclair-plus-aosp

* commit '04f6da353d4e79f49ba1d4897ed617e91acc3f77':
  - don't schedule syncs that we will never dispatch
2009-09-01 17:40:49 -07:00
Android (Google) Code Review
04f6da353d Merge change 23376 into eclair
* changes:
  - don't schedule syncs that we will never dispatch - expedite the INITIALIZATION sync
2009-09-01 17:38:25 -07:00
jsh
5b462477a9 Fix some sign in errors.
AccountManagerService.SimWatcher was checking if storedImsi = "initial"
instead of null as an initial condition.  Also, on NV-only CDMA devices
we were only sending SIM_STATE_CHANGED notifications when the radio
powered down, which meant storedImsi was only initialized if the radio
powered down.
2009-09-01 16:13:55 -07:00
Dmitri Plotnikov
b5759b5f4f Adding a convenience method to resolve contact lookup URI to a regular content URI 2009-09-01 15:58:40 -07:00
Tom Taylor
0b65eaaeed am 513069c3: Make a path constant
Merge commit '513069c39cd6610db2919c09abea2ff73158356a' into eclair-plus-aosp

* commit '513069c39cd6610db2919c09abea2ff73158356a':
  Make a path constant
2009-09-01 15:30:34 -07:00
Tom Taylor
513069c39c Make a path constant
Add a constant for the new locked uri.

Change-Id: I3bad24ac7ee806442bdd5e38be61005f081edf0d
2009-09-01 15:26:49 -07:00
Eric Fischer
c87d25215c Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.
In practice, no one ever writes an apostrophe in an aapt string with the
intent of using it to quote whitespace -- they always mean to include a
literal apostrophe in the string and then are surprised when they find
the apostrophe missing.  Make this an error so that it is discovered
right away instead of waiting until late in QA or after the strings have
already been sent for translation.  (And fix a recently-introduced string
that has exactly this problem.)

Silence the warning about an empty span in a string, since this seems to
annoy people instead of finding any real problems.

Make the error about having a translated string with no base string into
a warning, since this is a big pain when making changes to an application
that has already had some translations done, and the dead translations
should be removed by a later translation import anyway.
2009-09-01 15:20:30 -07:00
Grace Kloba
775745c40c am 9217c458: When we destroy a WebView, RESUME_TIMERS/PAUSE_TIMERS may be still in the queue. We need to pass them to WebViewCore as they are per process base. If we drop them, the counter in the JWebCoreJavaBridge can be out of order.
Merge commit '9217c45829da4d0c9c9dbdc6bc950c7f3e03e4f5' into eclair-plus-aosp

* commit '9217c45829da4d0c9c9dbdc6bc950c7f3e03e4f5':
  When we destroy a WebView, RESUME_TIMERS/PAUSE_TIMERS may be still in the queue.
2009-09-01 15:02:34 -07:00
Grace Kloba
9217c45829 When we destroy a WebView, RESUME_TIMERS/PAUSE_TIMERS may be still in the queue.
We need to pass them to WebViewCore as they are per process base. If we drop
them, the counter in the JWebCoreJavaBridge can be out of order.

Part 2 of fixing http://b/issue?id=2087410
2009-09-01 14:58:10 -07:00
Lixin Yue
8a61df6410 am 485e6dca: Merge change 23462 into eclair
Merge commit '485e6dca960c2001349de0817c644f24ae85c6e3' into eclair-plus-aosp

* commit '485e6dca960c2001349de0817c644f24ae85c6e3':
  Add Bluetooth Device trust
2009-09-01 14:11:53 -07:00
Android (Google) Code Review
485e6dca96 Merge change 23462 into eclair
* changes:
  Add Bluetooth Device trust
2009-09-01 14:10:06 -07:00
Lixin Yue
efa1dd716d Add Bluetooth Device trust 2009-09-01 13:58:31 -07:00
jsh
3b8916c25b am a01726a7: Some fixes to SMS processing in the framework.
Merge commit 'a01726a7fdd872cd8e1e8a9dfa52fb9cdbf01019' into eclair-plus-aosp

* commit 'a01726a7fdd872cd8e1e8a9dfa52fb9cdbf01019':
  Some fixes to SMS processing in the framework.
2009-09-01 13:40:15 -07:00
jsh
a01726a7fd Some fixes to SMS processing in the framework.
Always process class 0 and other unstored SMS (eg, MWI).  We were
rejecting all SMS messages in storage full situations, but certain
messages do not require storage.

Also, notify apps when the framework rejects MT SMS, with new
SMS_REJECTED_ACTION intent.

b/2066775
b/2015906
2009-09-01 13:35:20 -07:00
Derek Sollenberger
b127dc29bb Adding classes to enable plugins to use the java view system.
Change-Id: I2a9bb5b3d3759645257263797c977ecc4a44b263
2009-09-01 16:22:02 -04:00
Evan Millar
ac7d821d1a am 394c92ef: Merge change 23461 into eclair
Merge commit '394c92ef154e04fe37ac4688fc6b9cc13917db1f' into eclair-plus-aosp

* commit '394c92ef154e04fe37ac4688fc6b9cc13917db1f':
  Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider
2009-09-01 13:10:35 -07:00
Android (Google) Code Review
394c92ef15 Merge change 23461 into eclair
* changes:
  Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider
2009-09-01 13:09:25 -07:00
Dmitri Plotnikov
ec6b940659 am 6ff270fd: Merge change 23474 into eclair
Merge commit '6ff270fd854d7c62f857998446fccb803004f1c3' into eclair-plus-aosp

* commit '6ff270fd854d7c62f857998446fccb803004f1c3':
  Breaking sleep after yield into small quanta.
2009-09-01 13:06:04 -07:00
Android (Google) Code Review
6ff270fd85 Merge change 23474 into eclair
* changes:
  Breaking sleep after yield into small quanta.
2009-09-01 13:03:58 -07:00
Dianne Hackborn
93ca790c02 am d31825c6: Merge change 23403 into eclair
Merge commit 'd31825c6ff83a3e336efc97ced1b205fe65b11a9' into eclair-plus-aosp

* commit 'd31825c6ff83a3e336efc97ced1b205fe65b11a9':
  Various infrastructure to support a running services UI.
2009-09-01 12:33:07 -07:00
Android (Google) Code Review
d31825c6ff Merge change 23403 into eclair
* changes:
  Various infrastructure to support a running services UI.
2009-09-01 12:31:31 -07:00
Evan Millar
b3c4998284 Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider
This is necessary partly for general hygiene, but mostly because we need
to be able to determine based on the intent type what style URI to
return in the case of startActivityForResult().

Change-Id: Ib313d830b8646a70d5ac3ded11597af614429262
2009-09-01 12:14:12 -07:00
Dmitri Plotnikov
600bdd82f5 Breaking sleep after yield into small quanta.
Rationale: there is no reason to sleep for 4 seconds between
transactions if there is no one using the database.  This long
sleep only makes sense if two threads are actively using 
the database yielding to each other every several seconds.
2009-09-01 12:12:20 -07:00
Daniel Sandler
8a6129d549 am 0c91f5a3: Merge change 23464 into eclair
Merge commit '0c91f5a3b20fea1c937212c2aeec073128f6fdc3' into eclair-plus-aosp

* commit '0c91f5a3b20fea1c937212c2aeec073128f6fdc3':
  Create new hdpi versions of 1x data statusbar icons.
2009-09-01 11:51:53 -07:00
Android (Google) Code Review
0c91f5a3b2 Merge change 23464 into eclair
* changes:
  Create new hdpi versions of 1x data statusbar icons.
2009-09-01 11:49:45 -07:00
Daniel Sandler
f6aa42f968 Create new hdpi versions of 1x data statusbar icons.
Fixes http://b/2086838 with new, original artwork (i.e. not from TAT) to meet
Thursday build deadline.
2009-09-01 14:47:30 -04:00
Jean-Baptiste Queru
85a2c7f1ca merge from open-source master 2009-09-01 11:46:14 -07:00