Commit Graph

19539 Commits

Author SHA1 Message Date
Nick Pelly
a00c5f1169 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
Sylvain Fonteneau
b725845c8b 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
Dianne Hackborn
2b3fd0136e 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
Romain Guy
c645a80e5c 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
Eric Laurent
609dbde642 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
003a3761c1 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
7af9676611 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
fb1c1ba4ad 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
e6ba89b3ca 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
Justin Ho
f5bc40948c am b3c2d480: Merge "DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)" into gingerbread
Merge commit 'b3c2d4807f6bc631e2d1091ca4ebb8df39195bca' into gingerbread-plus-aosp

* commit 'b3c2d4807f6bc631e2d1091ca4ebb8df39195bca':
  DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)
2010-10-15 18:39:33 -07:00
Scott Main
a093ae41cd am c9f7890a: Revise some javadocs for NFC; add package description
Merge commit 'c9f7890a203a013646650a695157277df81b6a17' into gingerbread-plus-aosp

* commit 'c9f7890a203a013646650a695157277df81b6a17':
  Revise some javadocs for NFC; add package description
2010-10-15 18:25:34 -07:00
Shimeng (Simon) Wang
e04b251b75 am 7ef6834e: Merge "DO NOT MERGE" into gingerbread
Merge commit '7ef6834eea24e56d6eba3aac7069e9e0981451d7' into gingerbread-plus-aosp

* commit '7ef6834eea24e56d6eba3aac7069e9e0981451d7':
  DO NOT MERGE
2010-10-15 18:25:25 -07:00
Andreas Huber
3fcc33a1f8 am b04f356d: Merge "Include the framework copy of the OpenMAX headers instead of referencing external/opencore." into gingerbread
Merge commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678' into gingerbread-plus-aosp

* commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678':
  Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
2010-10-15 18:25:14 -07:00
Andreas Huber
28a0c199bc am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore." into gingerbread
Merge commit 'ff7a7a455c15077e2b691efa370619f06058f697' into gingerbread-plus-aosp

* commit 'ff7a7a455c15077e2b691efa370619f06058f697':
  Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
2010-10-15 18:24:56 -07:00
Dianne Hackborn
1b80474c2c am 736f5ec4: Merge "Work on issue #3101415: Crespo apps seem to have their UID changed over time." into gingerbread
Merge commit '736f5ec476526f3431d81dec5fb695bdee27e21a' into gingerbread-plus-aosp

* commit '736f5ec476526f3431d81dec5fb695bdee27e21a':
  Work on issue #3101415: Crespo apps seem to have their UID changed over time.
2010-10-15 18:24:49 -07:00
Irfan Sheriff
e6b39358d7 am 4e08a985: Merge "fix build DO NOT MERGE" into gingerbread
Merge commit '4e08a985418f581b4ca8c46316c85defd7b173cd' into gingerbread-plus-aosp

* commit '4e08a985418f581b4ca8c46316c85defd7b173cd':
  fix build DO NOT MERGE
2010-10-15 18:24:37 -07:00
Justin Ho
da8da48016 am 73dbdc35: Merge "DO NOT MERGE - Updated media transport controls (hdpi and mdpi)" into gingerbread
Merge commit '73dbdc35d4db5a03310bec8d8d7dcb58dba0c940' into gingerbread-plus-aosp

* commit '73dbdc35d4db5a03310bec8d8d7dcb58dba0c940':
  DO NOT MERGE - Updated media transport controls (hdpi and mdpi)
2010-10-15 18:24:30 -07:00
Shimeng (Simon) Wang
03ec872277 am 31e4d66a: Merge "DO NOT MERGE" into gingerbread
Merge commit '31e4d66ada01ea0714304309967a38d07bfce6c6' into gingerbread-plus-aosp

* commit '31e4d66ada01ea0714304309967a38d07bfce6c6':
  DO NOT MERGE
2010-10-15 18:24:06 -07:00
Leon Scroggins
8ac739519a am 36cb18cf: Merge "Line up textfield with WebTextView more often." into gingerbread
Merge commit '36cb18cf0684cadb3736969ff96f37d5eb9bb1a4' into gingerbread-plus-aosp

* commit '36cb18cf0684cadb3736969ff96f37d5eb9bb1a4':
  Line up textfield with WebTextView more often.
2010-10-15 18:23:58 -07:00
Irfan Sheriff
dc100dac1b am f8834f87: Merge "fetch macaddr right after supplicant connection" into gingerbread
Merge commit 'f8834f878fb6911cbd4719640cd2e6bf3a958a92' into gingerbread-plus-aosp

* commit 'f8834f878fb6911cbd4719640cd2e6bf3a958a92':
  fetch macaddr right after supplicant connection
2010-10-15 18:23:47 -07:00
Scott Main
dc825f2a69 am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
Merge commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b' into gingerbread-plus-aosp

* commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b':
  docs: fix typo; surface dev guide link in package description
2010-10-15 18:23:34 -07:00
Scott Main
3bb6f135fe am 7f3addf3: am 09da9609: docs: fix code snippet errors
Merge commit '7f3addf37f0aa106507792e8d9eaa3fb6662cdbb' into gingerbread-plus-aosp

* commit '7f3addf37f0aa106507792e8d9eaa3fb6662cdbb':
  docs: fix code snippet errors
2010-10-15 18:23:26 -07:00
Justin Ho
f510542648 am d3643668: Merge "DO NOT MERGE - Updated ADB icon" into gingerbread
Merge commit 'd364366824bf2b0aef81780eb673a42e0ba33bce' into gingerbread-plus-aosp

* commit 'd364366824bf2b0aef81780eb673a42e0ba33bce':
  DO NOT MERGE - Updated ADB icon
2010-10-15 18:23:18 -07:00
Dianne Hackborn
64f81bbc11 am efb58101: Debug logs for issue #3101415: Apps seem to have their UID changed over time.
Merge commit 'efb581018bbede2ecdc76bcd9722ded5b6903254' into gingerbread-plus-aosp

* commit 'efb581018bbede2ecdc76bcd9722ded5b6903254':
  Debug logs for issue #3101415: Apps seem to have their UID changed over time.
2010-10-15 18:22:25 -07:00
Eric Laurent
ecbb38c225 Merge "Fix issue 3098880." into gingerbread 2010-10-15 17:18:35 -07:00
Nick Kralevich
1e57c156af Merge "range checking for tnf" into gingerbread 2010-10-15 17:06:30 -07:00
Jean-Baptiste Queru
f4b45fecb4 Merge a851d8d0 from gingerbread
Change-Id: Iea0e3fa1662d6326ab337821fe52a65a9dfd989a
2010-10-15 17:02:57 -07:00
Kenny Root
aa1f79de9b Merge "Import revised translations DO NOT MERGE" into gingerbread 2010-10-15 16:55:40 -07:00
Jeff Brown
86e69e2339 Merge "Fix a native crash in input dispatcher when windows are removed." into gingerbread 2010-10-15 16:52:10 -07:00
Jeff Brown
9b39c7a79a Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbread 2010-10-15 16:52:02 -07:00
Justin Ho
35c4b498bc Merge "DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)" into gingerbread 2010-10-15 16:43:42 -07:00
Jeff Brown
b13d7b5cf0 Fix a native crash in input dispatcher when windows are removed.
Bug: 3101826
Change-Id: I040838600a6105c8d9f3235025dc0a7b5b27da2e
2010-10-15 16:20:51 -07:00
Jeff Brown
d9dd44d867 Add support for secure system overlays. (DO NOT MERGE)
This change adds a new window type for secure system overlays
created by the system itself from non-secure system overlays that
might be created by applications that have the system alert permission.
Secure views ignore the presence of secure system overlays.

Bug: 3098519
Change-Id: I8f8398f4fdeb0469e5d71124c21bedf121bd8c07
2010-10-15 16:03:35 -07:00
Shimeng (Simon) Wang
fbccbe1d16 Merge "DO NOT MERGE" into gingerbread 2010-10-15 15:17:22 -07:00
Andreas Huber
a28340d545 Merge "Include the framework copy of the OpenMAX headers instead of referencing external/opencore." into gingerbread 2010-10-15 14:58:54 -07:00
Andreas Huber
4b9f330f25 Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore." into gingerbread 2010-10-15 14:58:05 -07:00
Dianne Hackborn
3f2bb59fd3 Merge "Work on issue #3101415: Crespo apps seem to have their UID changed over time." into gingerbread 2010-10-15 14:55:06 -07:00
Irfan Sheriff
306bb9fe6a Merge "fix build DO NOT MERGE" into gingerbread 2010-10-15 14:30:36 -07:00
Justin Ho
bdcc5ce05a Merge "DO NOT MERGE - Updated media transport controls (hdpi and mdpi)" into gingerbread 2010-10-15 14:26:08 -07:00
Shimeng (Simon) Wang
c255165d89 Merge "DO NOT MERGE" into gingerbread 2010-10-15 14:07:29 -07:00
Leon Scroggins
151b9d0a0b Merge "Line up textfield with WebTextView more often." into gingerbread 2010-10-15 13:58:38 -07:00
Irfan Sheriff
53d30c41e3 Merge "fetch macaddr right after supplicant connection" into gingerbread 2010-10-15 13:42:38 -07:00
Scott Main
aad5711b5a am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
Merge commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c' into gingerbread

* commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c':
  docs: fix typo; surface dev guide link in package description
2010-10-15 12:35:04 -07:00
Scott Main
8d7a285c3a am 09da9609: docs: fix code snippet errors
Merge commit '09da96099917141f2b90d53f61baa822bdd434d7' into gingerbread

* commit '09da96099917141f2b90d53f61baa822bdd434d7':
  docs: fix code snippet errors
2010-10-15 12:34:50 -07:00
Justin Ho
d4305a0001 Merge "DO NOT MERGE - Updated ADB icon" into gingerbread 2010-10-15 11:53:49 -07:00
Nick Pelly
0f5fe63019 Merge "NFC: Move NFC service implementation out of system_server." into gingerbread 2010-10-15 10:55:11 -07:00
Scott Main
23e026b474 Merge "docs: fix typo; surface dev guide link in package description" into froyo 2010-10-15 10:46:33 -07:00
Nick Kralevich
981a5f01a0 am 612ebb92: Revert "Update the documentation for content provider security."
Merge commit '612ebb9257e2adf982ed846fa43251c3754361f7' into gingerbread-plus-aosp

* commit '612ebb9257e2adf982ed846fa43251c3754361f7':
  Revert "Update the documentation for content provider security."
2010-10-15 10:11:50 -07:00
Nick Kralevich
625bb9bb47 am 66f1c459: Merge "Update the documentation for content provider security." into gingerbread
Merge commit '66f1c459ac15d1dba1850cb30759500d35078f29' into gingerbread-plus-aosp

* commit '66f1c459ac15d1dba1850cb30759500d35078f29':
  Update the documentation for content provider security.
2010-10-15 09:24:39 -07:00
Nick Kralevich
8f424f999e Merge "Update the documentation for content provider security." into gingerbread 2010-10-15 09:17:12 -07:00