34409 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
ac2a88061d Remove one more opencore include path
Bug: 3101573
Change-Id: Id60845e4c46523e910504fe6e707f8247a3b6102
2010-10-18 08:41:14 -07:00
Jean-Baptiste Queru
5582cc3a68 Merge fb474872 from gingerbread-plus-aosp
Change-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3
2010-10-18 08:33:38 -07:00
Andreas Huber
5b9fd116f9 am 746c6a1c: am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore." into gingerbread
Merge commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4'

* commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4':
  Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
2010-10-18 08:05:09 -07:00
Dianne Hackborn
875ecaa511 am 13e46665: am 736f5ec4: Merge "Work on issue #3101415: Crespo apps seem to have their UID changed over time." into gingerbread
Merge commit '13e46665ff69c1a37880762d7d611aacdf02dac7'

* commit '13e46665ff69c1a37880762d7d611aacdf02dac7':
  Work on issue #3101415: Crespo apps seem to have their UID changed over time.
2010-10-18 08:04:47 -07:00
Irfan Sheriff
dab540e6f8 am cf66f587: (-s ours) am 4e08a985: Merge "fix build DO NOT MERGE" into gingerbread
Merge commit 'cf66f587514a935c290c8c9558243a48ba0243eb'

* commit 'cf66f587514a935c290c8c9558243a48ba0243eb':
  fix build DO NOT MERGE
2010-10-18 08:04:35 -07:00
Justin Ho
f58546da65 am e35cd5f5: (-s ours) am 73dbdc35: Merge "DO NOT MERGE - Updated media transport controls (hdpi and mdpi)" into gingerbread
Merge commit 'e35cd5f569fe760385198f485e4610ad13033dd3'

* commit 'e35cd5f569fe760385198f485e4610ad13033dd3':
  DO NOT MERGE - Updated media transport controls (hdpi and mdpi)
2010-10-18 08:04:28 -07:00
Shimeng (Simon) Wang
8b1373fbed am d687504e: (-s ours) am 31e4d66a: Merge "DO NOT MERGE" into gingerbread
Merge commit 'd687504e73b9d4a41b7ba28de864b4f3ab5c48e4'

* commit 'd687504e73b9d4a41b7ba28de864b4f3ab5c48e4':
  DO NOT MERGE
2010-10-18 08:04:08 -07:00
Leon Scroggins
e8aa954e46 resolved conflicts for merge of 46ca6a22 to master
Change-Id: I8302fa2f5acf91fb3793e5978a5dc63ac8f3a457
2010-10-18 10:09:07 -04:00
Nicolas Roard
3d09e139b3 Add the HTML5Audio class, to support the audio tag.
DO NOT MERGE. Cherry pick to GingerBread.

Bug: 3101402
Change-Id: Id7c9418c102d871933c7534fbde18a4bde5f353b
2010-10-18 12:56:02 +01:00
Hung-ying Tyan
a0cdfbf5b7 Uncomment SIP/VOIP feature check in SipManager.
http://b/issue?id=2971947

Change-Id: I3afa8eb03c4e347b382213dd388354365f766b2f
2010-10-18 19:48:04 +08:00
Chung-yih Wang
66cc5355a1 Set the thread pool size of NIST sip stack to one.
Set the thread pool size to one to fix the out-of-order packets
seen in sip service when the device is waken up from sleep.

bug:http://b/3099715
Change-Id: Ia169e3fde77488068c369e3345ecf6a6d8ddf792
2010-10-18 16:00:47 +08:00
Brian Carlstrom
393b84c137 Extended android.os.Debug.dumpNativeHeap to include /proc/self/maps contents
Change-Id: I86da98bc48111007d8226d8d0dbc7be470bde877
2010-10-17 23:40:43 -07:00
Irfan Sheriff
7a1af97689 am cf054d1c: (-s ours) am f8834f87: Merge "fetch macaddr right after supplicant connection" into gingerbread
Merge commit 'cf054d1cf605d46d3b2e459c28fe4516df104a39'

* commit 'cf054d1cf605d46d3b2e459c28fe4516df104a39':
  fetch macaddr right after supplicant connection
2010-10-17 22:02:32 -07:00
Nick Pelly
cd0e839a24 NFC: Move NFC service implementation out of system_server.
NFC service is now an application service in packages/apps/Nfc.

NFC service is registered through ServiceManager.addService(), and the proxy
object NfcAdapter obtains a handle to it through ServiceManager.getService().

**Important** Had to add new symbols AID_NFC / NFC_UID / android.uid.nfc and
modify service_manager.c, Process.java and PackageManagerService.java in order
to force the com.android.nfc process to take a fixed uid, so that it can use
ServiceManager.addService().

Most of the JNI has moved to packages/apps/Nfc/jni. However NdefRecord and
NdefMessage require some in-process native code, so android_com_NdefMessage.cpp
and android_com_NdefRecord.cpp stay in frameworks/base/core/jni. They link to
a very small library libnfc_ndef.so that implements NDEF message parsing. This
has been added to core.mk so all devices (even without NFC hardware) can work
with NDEF data.

Bug: 3041259
Bug: 3097445
Change-Id: If7f00cd8f2053acfc9319ca366d4a9c02bd396e6
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-17 18:35:29 -07:00
Nick Pelly
774b943fc6 am d1f7f4a6: Move hidden API\'s Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
Merge commit 'd1f7f4a68375f879671d300510f23d3ee78a500e' into gingerbread-plus-aosp

* commit 'd1f7f4a68375f879671d300510f23d3ee78a500e':
  Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
2010-10-17 17:50:20 -07:00
Nick Pelly
d1f7f4a683 Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
Change-Id: I9bb67de2956b1ecb765ca4ac142ed9455060bec4
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-17 16:30:40 -07:00
Sylvain Fonteneau
73cd4fff52 am a926540d: Implement methods introduced in draft #5 NFC API.
Merge commit 'a926540d5455a973dd8ca19c00c108620d9c68c2' into gingerbread-plus-aosp

* commit 'a926540d5455a973dd8ca19c00c108620d9c68c2':
  Implement methods introduced in draft #5 NFC API.
2010-10-17 15:17:38 -07:00
Sylvain Fonteneau
a926540d54 Implement methods introduced in draft #5 NFC API.
The API is implemented but still do not support muli-protocol tags.

Change-Id: I5cea3eec7b5b92e8e1106d4660e2400e4433e943
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-17 15:06:45 -07:00
Scott Main
dbb78f0e4e am 81df9841: am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
Merge commit '81df9841c64e417fe2adfab0e8d694af09e07c0d'

* commit '81df9841c64e417fe2adfab0e8d694af09e07c0d':
  docs: fix typo; surface dev guide link in package description
2010-10-17 13:49:45 -07:00
Scott Main
2d8933879c am b2bd4700: am 7f3addf3: am 09da9609: docs: fix code snippet errors
Merge commit 'b2bd470010279fe45e2848aa8cd0b3ad6f6ca800'

* commit 'b2bd470010279fe45e2848aa8cd0b3ad6f6ca800':
  docs: fix code snippet errors
2010-10-17 13:49:35 -07:00
Justin Ho
2b7b7c1543 am 92e0fd6c: (-s ours) am d3643668: Merge "DO NOT MERGE - Updated ADB icon" into gingerbread
Merge commit '92e0fd6ce20a111e9ad82b5b252b892e2b971b98'

* commit '92e0fd6ce20a111e9ad82b5b252b892e2b971b98':
  DO NOT MERGE - Updated ADB icon
2010-10-17 13:49:27 -07:00
Dianne Hackborn
1769256966 am 10d48f26: am efb58101: Debug logs for issue #3101415: Apps seem to have their UID changed over time.
Merge commit '10d48f26e72dc7978ae683e8f99cc71409eb75ef'

* commit '10d48f26e72dc7978ae683e8f99cc71409eb75ef':
  Debug logs for issue #3101415: Apps seem to have their UID changed over time.
2010-10-17 13:49:16 -07:00
Jean-Baptiste Queru
7247cfa9cd am 36e7790b: (-s ours) Merge a851d8d0 from gingerbread
Merge commit '36e7790b6b3c2c36c67fbe5dc2e2313cdd537349'

* commit '36e7790b6b3c2c36c67fbe5dc2e2313cdd537349':
  NFC: Move NFC service implementation out of system_server.
2010-10-17 13:49:03 -07:00
Dianne Hackborn
964eb4389b am 42499170: Implement issue #3094621 and #3094609 - wipe sd card
Merge commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0' into gingerbread-plus-aosp

* commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0':
  Implement issue #3094621 and #3094609 - wipe sd card
2010-10-16 16:51:13 -07:00
Dianne Hackborn
424991704b Implement issue #3094621 and #3094609 - wipe sd card
3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command

Also since we have decided that it is important to consider
the Crespo storage as internal storage, DevicePolicyManager
gets a new API to be able to wipe it.  (No big deal, since
all of the work for this is now done in the implementation
of the new UI.)

Change-Id: I32a77c410f710a87dcdcbf6586c09bd2e48a8807
2010-10-16 16:32:15 -07:00
Nick Kralevich
5ac4fe5113 am 6bc34da8: am 612ebb92: Revert "Update the documentation for content provider security."
Merge commit '6bc34da8acf26c8e70325719fe43eaf22489809d'

* commit '6bc34da8acf26c8e70325719fe43eaf22489809d':
  Revert "Update the documentation for content provider security."
2010-10-16 09:43:23 -07:00
Nick Kralevich
8bc68360b6 am 86052a87: am 66f1c459: Merge "Update the documentation for content provider security." into gingerbread
Merge commit '86052a87409e7ceac654ffebbb9bcfce1597c5d8'

* commit '86052a87409e7ceac654ffebbb9bcfce1597c5d8':
  Update the documentation for content provider security.
2010-10-16 09:14:21 -07:00
Andreas Huber
8f9486c1ad am cb90947b: am e1f3976b: Merge "Make sure we cache the sampleTable again if using the caching datasource." into gingerbread
Merge commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611'

* commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611':
  Make sure we cache the sampleTable again if using the caching datasource.
2010-10-16 09:14:06 -07:00
Brad Fitzpatrick
da3fe88b2d am 33476b2d: am feebaf35: Merge "Don\'t crash on null Vibrator during reboot." into gingerbread
Merge commit '33476b2db82b5a7f025eb9625fa56f94290e97f4'

* commit '33476b2db82b5a7f025eb9625fa56f94290e97f4':
  Don't crash on null Vibrator during reboot.
2010-10-16 09:13:39 -07:00
Jeff Brown
c52862edcf am 5f0cbfce: am c1e7b218: Merge "Improve input device calibration format." into gingerbread
Merge commit '5f0cbfcecc4db20f897507c826296b3aac70c592'

* commit '5f0cbfcecc4db20f897507c826296b3aac70c592':
  Improve input device calibration format.
2010-10-16 09:13:13 -07:00
Jeff Brown
3ee1e7b5ab am dc3ad87c: am 78a76fea: Merge "Revert to using epoll_wait()." into gingerbread
Merge commit 'dc3ad87c04348c925aa86863ed6d25f18a8c6c36'

* commit 'dc3ad87c04348c925aa86863ed6d25f18a8c6c36':
  Revert to using epoll_wait().
2010-10-16 09:12:43 -07:00
Hung-ying Tyan
e1baa9c79f am ebad42d6: am 3fbfee2f: Merge "SipService: add wake lock for incoming INVITE packets." into gingerbread
Merge commit 'ebad42d6d35dc0dc07fe89650268453dbdff8a79'

* commit 'ebad42d6d35dc0dc07fe89650268453dbdff8a79':
  SipService: add wake lock for incoming INVITE packets.
2010-10-16 09:01:04 -07:00
Justin Ho
047a3bdc0f am 6e48b5f9: (-s ours) am b593d976: Merge "Updated GPS icons and new status bar background" into gingerbread
Merge commit '6e48b5f97af6d67574fee6053174c184f87ce583'

* commit '6e48b5f97af6d67574fee6053174c184f87ce583':
  Updated GPS icons and new status bar background
2010-10-16 09:00:26 -07:00
Daniel Lehmann
b759096e91 am c61c98fd: (-s ours) am d16f7588: Merge "DO NOT MERGE: Private API to pass the selected tab through QuickContacts" into gingerbread
Merge commit 'c61c98fdba0f705e29d6d1e9fc81e33d4cb07ff9'

* commit 'c61c98fdba0f705e29d6d1e9fc81e33d4cb07ff9':
  DO NOT MERGE: Private API to pass the selected tab through QuickContacts
2010-10-16 08:59:54 -07:00
Eric Laurent
2cd55d2f6d am 83ed30e5: am ae0bb04a: Merge "Fix issue 3098850" into gingerbread
Merge commit '83ed30e5e7aab370400657bcdafde2f071de0b54'

* commit '83ed30e5e7aab370400657bcdafde2f071de0b54':
  Fix issue 3098850
2010-10-16 08:59:37 -07:00
Joe Onorato
b25d5be54b am 258d0e80: am 0d65a3fc: Merge "Screen on/off animation tweaks" into gingerbread
Merge commit '258d0e805ee63685b807b5dae43efc5ecc97179e'

* commit '258d0e805ee63685b807b5dae43efc5ecc97179e':
  Screen on/off animation tweaks
2010-10-16 08:59:20 -07:00
Justin Ho
2c3a7869cc am fd28b451: (-s ours) am 1fefe88c: Another attempt at popup assets (hdpi and mdpi)
Merge commit 'fd28b45125f7d58a9d88c0dd09fe610f6e5878df'

* commit 'fd28b45125f7d58a9d88c0dd09fe610f6e5878df':
  Another attempt at popup assets (hdpi and mdpi)
2010-10-16 08:59:08 -07:00
Mathias Agopian
7ece231e4a am 9f6d18ca: am 04358138: Merge "[3095807] screen takes a long time to turn on" into gingerbread
Merge commit '9f6d18cadf9ac50062063f5f5ff5de7f6895696a'

* commit '9f6d18cadf9ac50062063f5f5ff5de7f6895696a':
  [3095807] screen takes a long time to turn on
2010-10-16 08:58:35 -07:00
Jesse Wilson
ad4eeb6e76 am 9bb8e5cc: am 8f666c2d: Merge "Test that we don\'t leak sensitive information when logging cookies." into gingerbread
Merge commit '9bb8e5cc3e9f8ae2c46967ee1fd422f3bf1e9429'

* commit '9bb8e5cc3e9f8ae2c46967ee1fd422f3bf1e9429':
  Test that we don't leak sensitive information when logging cookies.
2010-10-16 08:58:13 -07:00
Mathias Agopian
596e590b47 am 7e9a54d4: am d4e03f37: addresses parts of 3096779 and 3097475
Merge commit '7e9a54d460030a871a4f05e61e943c6a694e9ef8'

* commit '7e9a54d460030a871a4f05e61e943c6a694e9ef8':
  addresses parts of 3096779 and 3097475
2010-10-16 08:52:30 -07:00
Mathias Agopian
1cf3e2d002 am a8faf91f: am 6d71f6a0: Merge "fix [3095607] Gingerbread screen turn-on animation does not show the last frame" into gingerbread
Merge commit 'a8faf91fa558be1235d508e776eb24be4429585c'

* commit 'a8faf91fa558be1235d508e776eb24be4429585c':
  fix [3095607] Gingerbread screen turn-on animation does not show the last frame
2010-10-16 08:52:12 -07:00
Chris Tate
b478f4606e Drag/drop changes
* Increase the opacity of the drag thumbnail a bit
* Properly present window-local drag locations; this fixes drags into
  the status bar
* Pass the current drag touch point in DRAG_STARTED. This may
  be reconsidered, but might conceivably be useful to someone.

Change-Id: I77690e82e9831ed6be412990c1c9da92e700a501
2010-10-15 20:30:32 -07:00
Romain Guy
157fa0aca5 am 77c011ba: Set default heap size to 5MB.
Merge commit '77c011ba75ee1403c9b7626e4676cd3c8746605b' into gingerbread-plus-aosp

* commit '77c011ba75ee1403c9b7626e4676cd3c8746605b':
  Set default heap size to 5MB.
2010-10-15 19:23:32 -07:00
Romain Guy
77c011ba75 Set default heap size to 5MB.
Change-Id: Iac8ae3cbe6b431767776653c9f430983172cfb6f
2010-10-15 19:15:25 -07:00
Adam Powell
2a8ecf3f29 Merge "Change AlertDialogs to use button groups." 2010-10-15 18:56:06 -07:00
Eric Laurent
1a32602212 am 208bb08a: Merge "Fix issue 3098880." into gingerbread
Merge commit '208bb08a8b4896bc51b44aeec41b91d4726007cf' into gingerbread-plus-aosp

* commit '208bb08a8b4896bc51b44aeec41b91d4726007cf':
  Fix issue 3098880.
2010-10-15 18:42:06 -07:00
Nick Kralevich
21059b637c am 5e7b7cd6: Merge "range checking for tnf" into gingerbread
Merge commit '5e7b7cd65bea53357ecad68a31a52883897c824b' into gingerbread-plus-aosp

* commit '5e7b7cd65bea53357ecad68a31a52883897c824b':
  range checking for tnf
2010-10-15 18:41:59 -07:00
Kenny Root
097ea0bb50 am dc83fd5a: Merge "Import revised translations DO NOT MERGE" into gingerbread
Merge commit 'dc83fd5a502b255dd29a4ab351fc902105ca6bb8' into gingerbread-plus-aosp

* commit 'dc83fd5a502b255dd29a4ab351fc902105ca6bb8':
  Import revised translations DO NOT MERGE
2010-10-15 18:41:08 -07:00
Jeff Brown
9e0e054388 am 36e65ffd: Merge "Fix a native crash in input dispatcher when windows are removed." into gingerbread
Merge commit '36e65ffd16f2610dcec702e23d596fe4eb6b6c4a' into gingerbread-plus-aosp

* commit '36e65ffd16f2610dcec702e23d596fe4eb6b6c4a':
  Fix a native crash in input dispatcher when windows are removed.
2010-10-15 18:40:45 -07:00
Jeff Brown
6ba052b484 am c1a564b1: Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbread
Merge commit 'c1a564b108c511c0bdd699567c245b031930e718' into gingerbread-plus-aosp

* commit 'c1a564b108c511c0bdd699567c245b031930e718':
  Add support for secure system overlays.  (DO NOT MERGE)
2010-10-15 18:40:39 -07:00