ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
19,458 Commits 2 Branches 0 Tags 54 MiB
3f965b9ede
Commit Graph

19458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Huang
99fddbcf44 am 45bd8303: Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread 
Merge commit '45bd8303fe20f20843f5a76ddf42a5ace54add58' into gingerbread-plus-aosp

* commit '45bd8303fe20f20843f5a76ddf42a5ace54add58':
  Uncomment SIP/VOIP feature check in SipManager.
 2010-10-18 13:44:57 -07:00
John Huang
73aa416a59 am 382717f3: Merge "Set the thread pool size of NIST sip stack to one." into gingerbread 
Merge commit '382717f3eeca1a21e9756c7de42b4d31747d1675' into gingerbread-plus-aosp

* commit '382717f3eeca1a21e9756c7de42b4d31747d1675':
  Set the thread pool size of NIST sip stack to one.
 2010-10-18 13:42:31 -07:00
John Huang
2d512f5736 Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread 2010-10-18 13:41:04 -07:00
John Huang
c346fa137b Merge "Set the thread pool size of NIST sip stack to one." into gingerbread 2010-10-18 13:39:33 -07:00
Joe Onorato
a02711185b am a8d477f0: Merge "Pressing the power button quickly needs to turn the screen on and off correctly." into gingerbread 
Merge commit 'a8d477f0d7fd0cf01c47e37c59f26c5fa4d1cf42' into gingerbread-plus-aosp

* commit 'a8d477f0d7fd0cf01c47e37c59f26c5fa4d1cf42':
  Pressing the power button quickly needs to turn the screen on and off correctly.
 2010-10-18 13:16:42 -07:00
Joe Onorato
3e640596eb Merge "Pressing the power button quickly needs to turn the screen on and off correctly." into gingerbread 2010-10-18 13:14:16 -07:00
Nick Pelly
2f1d7c3b8e am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread 
Merge commit '1f90908c19ab24791bd54c856b32bb12682496eb' into gingerbread-plus-aosp

* commit '1f90908c19ab24791bd54c856b32bb12682496eb':
  Prevent use of NFC api if device is not featurized for NFC.
 2010-10-18 12:04:16 -07:00
Nick Pelly
8a1c39374c Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread 2010-10-18 12:00:48 -07:00
Andreas Huber
c283c2e2c5 am bc96c284: Merge "For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread 
Merge commit 'bc96c2848dadaa844f95e89708d9941f73bbf400' into gingerbread-plus-aosp

* commit 'bc96c2848dadaa844f95e89708d9941f73bbf400':
  For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.
 2010-10-18 11:50:19 -07:00
Ying Wang
4564c6510a am 004f968d: Merge "Link against the static libcrypto in external/openssl." into gingerbread 
Merge commit '004f968d0cf60c08d7b393129ed2d6e4304041e5' into gingerbread-plus-aosp

* commit '004f968d0cf60c08d7b393129ed2d6e4304041e5':
  Link against the static libcrypto in external/openssl.
 2010-10-18 11:50:08 -07:00
Andreas Huber
0918dd2f05 Merge "For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread 2010-10-18 11:46:44 -07:00
Ying Wang
f52c24a3b0 Merge "Link against the static libcrypto in external/openssl." into gingerbread 2010-10-18 11:44:28 -07:00
Andreas Huber
49ee8ab88a am 02ec432e: Merge "If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs." into gingerbread 
Merge commit '02ec432e6eff2ab59165c5b7c9b1a0d6689d0823' into gingerbread-plus-aosp

* commit '02ec432e6eff2ab59165c5b7c9b1a0d6689d0823':
  If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs.
 2010-10-18 11:24:05 -07:00
Andreas Huber
f0ab0edc19 Merge "If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs." into gingerbread 2010-10-18 11:18:11 -07:00
Gilles Debunne
9a3fca9f0e am 3d01cb93: Merge "Removed "Select word" option on password fields." into gingerbread 
Merge commit '3d01cb934ba2c5161689834d49f520313e554571' into gingerbread-plus-aosp

* commit '3d01cb934ba2c5161689834d49f520313e554571':
  Removed "Select word" option on password fields.
 2010-10-18 10:26:50 -07:00
Ben Murdoch
a314c36f6c am 83366dfb: Merge "Add the HTML5Audio class, to support the audio tag." into gingerbread 
Merge commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3' into gingerbread-plus-aosp

* commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3':
  Add the HTML5Audio class, to support the audio tag.
 2010-10-18 10:26:43 -07:00
Nick Pelly
ce5b648601 am e47150e9: Fix up NFC permissions. 
Merge commit 'e47150e933e6f610546f57183477f324566e521e' into gingerbread-plus-aosp

* commit 'e47150e933e6f610546f57183477f324566e521e':
  Fix up NFC permissions.
 2010-10-18 10:26:12 -07:00
Gilles Debunne
edeaa96c99 Merge "Removed "Select word" option on password fields." into gingerbread 2010-10-18 10:16:13 -07:00
Ben Murdoch
319b628127 Merge "Add the HTML5Audio class, to support the audio tag." into gingerbread 2010-10-18 10:15:55 -07:00
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