7527 Commits

Author SHA1 Message Date
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
Chung-yih Wang
585fb14c56 am 940da983: Merge change 23585 into eclair
Merge commit '940da9836aa6ce72cd025aedd1cf78c3dd277240' into eclair-plus-aosp

* commit '940da9836aa6ce72cd025aedd1cf78c3dd277240':
  Print error message if the buffer size is too small.
2009-09-02 00:15:38 -07:00
Chung-yih Wang
c758578735 am 9c64d590: Merge change 23425 into eclair
Merge commit '9c64d59027a09699ec5ef1f0fedd88910ee7ae27' into eclair-plus-aosp

* commit '9c64d59027a09699ec5ef1f0fedd88910ee7ae27':
  Store CA certificate chain into one single key entry with PEM format.
2009-09-02 00:15:33 -07:00
Android (Google) Code Review
14d8e6e5d5 Merge change 23609 into eclair
* changes:
  Fix SDK build breakage.
2009-09-02 00:07:09 -07:00
Android (Google) Code Review
940da9836a Merge change 23585 into eclair
* changes:
  Print error message if the buffer size is too small.
2009-09-01 23:49:42 -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
Android (Google) Code Review
9c64d59027 Merge change 23425 into eclair
* changes:
  Store CA certificate chain into one single key entry with PEM format.
2009-09-01 23:23:41 -07: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
Android (Google) Code Review
9756a70bd9 Merge change 23582 into eclair
* changes:
  Expand apps' control over the settings restore process
2009-09-01 21:00:59 -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
Chung-yih Wang
60c821c8ee Print error message if the buffer size is too small. 2009-09-02 11:54:24 +08:00
Jason Sams
ace6194fbf am f4cca783: Merge change 23583 into eclair
Merge commit 'f4cca783dff5335108647ff7ae86983f56245067' into eclair-plus-aosp

* commit 'f4cca783dff5335108647ff7ae86983f56245067':
  Update fountain to use structures.
2009-09-01 20:43:58 -07:00
Android (Google) Code Review
f4cca783df Merge change 23583 into eclair
* changes:
  Update fountain to use structures.
2009-09-01 20:42:19 -07:00
Jason Sams
b22f5b3bb3 Simple app to create a gl2 context and dump the strings. 2009-09-01 20:41:05 -07:00
Dianne Hackborn
e1b4437dba Revert "Fix content provider"
Argh!

This reverts commit da706900f45dca82d89f090e4e52fa5d1772c495.
2009-09-01 19:21:08 -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
Dianne Hackborn
470f54d299 am 2d2d5c43: am c804efe2: Merge change 23569 into donut
Merge commit '2d2d5c4372b8ea5cf925c838b2149686211445af' into eclair-plus-aosp

* commit '2d2d5c4372b8ea5cf925c838b2149686211445af':
  Update 4.xml to the most recent APIs.
2009-09-01 19:20:39 -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
Dianne Hackborn
2d2d5c4372 am c804efe2: Merge change 23569 into donut
Merge commit 'c804efe278fa33555e6e836504a467cb14505eb3' into eclair

* commit 'c804efe278fa33555e6e836504a467cb14505eb3':
  Update 4.xml to the most recent APIs.
2009-09-01 19:18:18 -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
Android (Google) Code Review
c804efe278 Merge change 23569 into donut
* changes:
  Update 4.xml to the most recent APIs.
2009-09-01 19:15:59 -07:00
Dianne Hackborn
2c8859aeda Update 4.xml to the most recent APIs. 2009-09-01 19:14:55 -07:00
Dianne Hackborn
ea49cf658d am ff0dc82c: am 6a98f8d9: Merge change 23499 into donut
Merge commit 'ff0dc82c1cfe780e6f4c87d1d34de6dc3b741a2d' into eclair-plus-aosp

* commit 'ff0dc82c1cfe780e6f4c87d1d34de6dc3b741a2d':
  Fix content provider
2009-09-01 19:14:08 -07:00
Dianne Hackborn
ff0dc82c1c am 6a98f8d9: Merge change 23499 into donut
Merge commit '6a98f8d93e4ddd407baad8d9b7481a892001d281' into eclair

* commit '6a98f8d93e4ddd407baad8d9b7481a892001d281':
  Fix content provider
2009-09-01 19:11:44 -07:00
Scott Main
52a243b9a8 am cc22efb5: am dc516413: Merge change 23503 into donut
Merge commit 'cc22efb52e8b5851b7d53099f7f814bfae266124' into eclair-plus-aosp

* commit 'cc22efb52e8b5851b7d53099f7f814bfae266124':
  docs only.
2009-09-01 19:09:36 -07:00
Android (Google) Code Review
6a98f8d93e Merge change 23499 into donut
* changes:
  Fix content provider
2009-09-01 19:09:24 -07:00
Scott Main
cc22efb52e am dc516413: Merge change 23503 into donut
Merge commit 'dc5164134c507f747f1cf89c01e4fb5e724eccd4' into eclair

* commit 'dc5164134c507f747f1cf89c01e4fb5e724eccd4':
  docs only.
2009-09-01 19:07:10 -07:00
Android (Google) Code Review
dc5164134c Merge change 23503 into donut
* changes:
  docs only. expand the uses-feature docs
2009-09-01 19:04:15 -07:00
Scott Main
0ae4bda0e8 am 4e0951c9: am 4e60d012: docs only. add syntax samples for all attributes and revise targetSdkVersion information.
Merge commit '4e0951c9f31c5b5a6026552ede3f47aa038b525e' into eclair-plus-aosp

* commit '4e0951c9f31c5b5a6026552ede3f47aa038b525e':
  docs only.
2009-09-01 18:49:52 -07:00
Scott Main
4e0951c9f3 am 4e60d012: docs only. add syntax samples for all attributes and revise targetSdkVersion information.
Merge commit '4e60d012c95f50ddd2a1ba6202e4fec3c9cfd3df' into eclair

* commit '4e60d012c95f50ddd2a1ba6202e4fec3c9cfd3df':
  docs only.
2009-09-01 18:48:34 -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
Scott Main
c6747d02c6 docs only.
expand the uses-feature docs

Change-Id: I47e7d7570fdab6f0f698ecc978c8cecca8c1d28b
2009-09-01 17:12:53 -07:00
Jean-Michel Trivi
3a87a91176 am b1461fb4: Merge change 23542 into eclair
Merge commit 'b1461fb4824f872faff40b206383d5e0faeda2ea' into eclair-plus-aosp

* commit 'b1461fb4824f872faff40b206383d5e0faeda2ea':
  Modify the gain after filtering to prevent TTS clipping in en-US.
2009-09-01 16:21:09 -07:00
Android (Google) Code Review
b1461fb482 Merge change 23542 into eclair
* changes:
  Modify the gain after filtering to prevent TTS clipping in en-US.
2009-09-01 16:19:14 -07:00
Scott Main
4e60d012c9 docs only.
add syntax samples for all attributes and revise
targetSdkVersion information.

Change-Id: I164da5870743be259e64827c36c4c5eed55fa2b0
2009-09-01 16:17:36 -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
Andreas Huber
43ad6eaf77 Squashed commit of the following:
commit c45bfbb97ccd05982008df47181f9c73abaf0497
Author: Andreas Huber <andih@google.com>
Date:   Tue Sep 1 15:58:12 2009 -0700

    This quirk should not be enabled by default in order to make the bug reproducible by the vendor.

commit 21d72e80e795fcae53d9c3bcc8ba6312b081e420
Author: Andreas Huber <andih@google.com>
Date:   Tue Sep 1 15:55:45 2009 -0700

    Undoing the hack to temporarily give up the lock to facilitate reading from the buffer source.

    This simply causes too many issues, there need to be independent threads providing input buffers and dequeuing output buffers.

commit 84d507def8999c146ce124cc8edfe106c9ca70c2
Author: Andreas Huber <andih@google.com>
Date:   Tue Sep 1 15:16:23 2009 -0700

    The AAC components appear to output stereo data even if the input data is mono...
2009-09-01 16:02:43 -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
Wink Saville
3d122b56d9 am 65d62c77: Add hasIccCard to IccCard and TelephonyManager.
Merge commit '65d62c774e42d8bf9a55ef50e153ffc9e277ef37' into eclair-plus-aosp

* commit '65d62c774e42d8bf9a55ef50e153ffc9e277ef37':
  Add hasIccCard to IccCard and TelephonyManager.
2009-09-01 15:58:10 -07:00
Wink Saville
65d62c774e Add hasIccCard to IccCard and TelephonyManager.
Expose the presence/absence of IccCards in the system.
This is needed to fix bug 2033811 which needs to show
some SIM menus in the Mms app and Contact apps only if
there is a SIM and on CDMA there is no sims yet.

The current implementation assumes CDMA never has an
IccCard this is true at the moment but needs to change.

Change-Id: I4167368e364623ea68e9b2778556e6d730b1e715
2009-09-01 15:52:42 -07:00
San Mehat
1726b48302 am 03a3327b: Merge change 23506 into eclair
Merge commit '03a3327badda54728de2ca969b31b53f5ad9ad3a' into eclair-plus-aosp

* commit '03a3327badda54728de2ca969b31b53f5ad9ad3a':
  dumpstate: Add support for apanic crash data
2009-09-01 15:42:30 -07:00
Android (Google) Code Review
03a3327bad Merge change 23506 into eclair
* changes:
  dumpstate: Add support for apanic crash data
2009-09-01 15:40:28 -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