wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
147,393 Commits 1 Branch 166 Tags 1.2 GiB
499a20ae5f
Commit Graph

598 Commits

Author SHA1 Message Date
Gina Yeh
a8ebac2175 Bug 830213 - Patch 3: Remove BluetoothScoManager, r=echou 2013-05-10 19:03:25 +08:00
Gina Yeh
8332be4c87 Bug 830213 - Patch 2: Implementation of ConnectSco/DisconnectSco/IsScoConnected in BluetoothHfpManager, r=echou, sr=mrbkap 2013-05-10 19:01:10 +08:00
Gina Yeh
2101483114 Bug 830213 - Patch 1: Add ConnectSco, DisconnectSco, IsScoConnected in nsIDOMBluetoothAdapter, r=echou, sr=mrbkap 2013-05-10 18:58:59 +08:00
Shawn Huang
e5c13cb000 Bug 869306: Update call direction if call state changes, r=echou 2013-05-10 17:47:16 +08:00
Hsin-Yi Tsai
f573249777 Bug 869306 - Add call.isOutgoing for BT Cert. r=allstars.chh 2013-05-08 18:39:05 +08:00
Eric Chou
5460ee2214 Bug 860166 - New mechanism for establishing outboung Bluetooth connection, r=mrbkap 
Things we have done in this patch:

1. Make BluetoothHfpManager/BluetoothOppManager implement BluetoothProfileManagerBase
2. Add function BluetoothService::GetServiceChannel()
3. Once GetServiceChannel() is done, callback Bluetooth*Manager::OnGetServiceChannel() will be invoked
4. Remove unused function BluetoothService::GetSocketViaService()
 2013-05-10 14:39:12 +08:00
Eric Chou
42d6900093 Bug 860166 - Create new class BluetoothProfileManagerBase, r=mrbkap 
BluetoothProfileManagerBase is a base class of Bluetooth profile managers.
It will be a generic interface declaring basic functions that all profile
managers should implement, such as Connect(), Disconnect() and IsConnected().
Currently there is only one callback function OnGetServiceChannel(), which
will be called after calling BluetoothService::GetServiceChannel().
 2013-05-10 14:39:09 +08:00
Shawn Huang
caf7ac3e9d Bug 869337 - Fix missing At comman reply OK after +COPS, r=gyeh, r=echou 2013-05-10 13:46:50 +08:00
Eric Chou
578460bdc1 Bug 869296 - New mechanism to deal with AT commands 'AT+BLDN' and 'ATD>n', r=gyeh 
According to HFP spec, when we receive AT command 'AT+BLDN', we shall respond
with:

  1. 'OK' if the call history is not empty. An outgoing call would be made
  2. 'ERROR' if the call history is empty. No call would be made.

However, with current implementation, we are unable to know whether the call
history is empty or not in Gecko. Therefore I introduce a solution, using a task
and a flag to decide if a call is made after AT+BLDN is received, which may not
be perfect but reliable, easy to understand and easy to implement.
 2013-05-09 22:10:28 +08:00
Eric Chou
052e54616e Bug 869296 - Do 'Last Number Redial' when we receive ATD>n, r=gyeh 2013-05-09 22:10:28 +08:00
Eric Chou
cde567409c Bug 869332 - Don't reset call status while receiving an unhandled CallStateChanged event, r=gyeh 2013-05-08 14:16:51 +08:00
David Zbarsky
a79bf02c5d Bug 866450 Part 2: Fix rooting hazards under content/ and dom/ r=bz 2013-05-02 05:12:46 -04:00
Eric Chou
f29b41001e Bug 866615 - Modify the nsDeviceStorage type from 'movies' to 'videos', r=dougt 
From 19f4e6e369439a1626fbc69ac2dd72b63e56d397 Mon Sep 17 00:00:00 2001
 2013-04-29 17:10:30 +08:00
Gina Yeh
f1fd626ee2 Bug 850157 - Add GetConnectedDevices() in nsIDOMBluetoothAdapter.idl, r=echou, sr= mrbkap 2013-04-26 18:48:21 +08:00
Eric Chou
2233009663 Bug 864575 - Notify all observers of file-changing at the right time, r=gyeh 
When we receive multiple files in a row, we need to notify observers of
file-changing whenever a file is completely received. Currently we only
send one notification at the end of the entire session.
 2013-04-26 18:09:04 +08:00
Eric Chou
90c597dd73 Bug 817972 - Make Gecko Bluetooth capable of queueing file-sending requests, r=gyeh 2013-04-26 18:09:00 +08:00
Dave Hylands
505d1f5061 Bug 860934 - Use relative paths when handling device storage r=dougt 2013-04-18 16:13:23 +02:00
David Zbarsky
a0911f7978 [Bug 857884] Use dom::EventTarget more instead of nsIDOMEventTarget Part 6 r=Ms2ger 2013-04-19 18:18:33 -04:00
Gina Yeh
e38e47e3e5 Bug 863620 - Followup of bug 848414, r=echou 2013-04-19 14:40:51 +02:00
Eric Chou
c8991a8d73 Bug 860166 - Revice AT command handler for Headset profile (HSP), r=gyeh 2013-04-19 17:08:06 +08:00
Eric Chou
72c721a24a Bug 860166 - Use two server sockets to listen to both HFP and HSP services, r=gyeh, r=mrbkap 2013-04-19 17:08:00 +08:00
John Lin
21c5ab7a94 Bug 860075 - Avoid duplicate BT signal observer registration from child process. r=echou, r=gyeh 2013-04-19 16:40:56 +08:00
Ryan VanderMeulen
ff2b61df0c Backed out changeset 8f7ef60b6f5a (bug 860934) for mochitest asserts and crashes. 2013-04-18 12:02:27 -04:00
Gina Yeh
5dd5045ef8 Bug 859727 - Remove routing logic from BluetoothScoManager, r=echou, r=rlin 2013-04-18 17:41:17 +02:00
Dave Hylands
fe279137c1 Bug 860934 - Use relative paths when handling device storage r=dougt 2013-04-18 16:13:23 +02:00
Kyle Machulis
d9f2985869 Bug 862462 - Make sure BluetoothAdapter unroots before destruction; r=mrbkap 2013-04-16 14:54:00 -07:00
Kyle Machulis
34cf59e292 Bug 861980 - Change sockopt length to be a socklen_t; r=echou 2013-04-16 14:54:00 -07:00
Boris Zbarsky
a295fe137f Bug 835643 part 4. Put in place all the infrastructure to switch EventListener to WebIDL codegen. r=smaug 2013-04-16 17:16:08 -04:00
Mike Shal
24b4056720 Bug 846634 - Part 2: Move EXPORTS to moz.build; r=joey 2013-04-16 15:24:43 -04:00
Gina Yeh
6cb6e4c549 Bug 857896 - Convert device property "Connected" into a boolean if bluez returns a two-byte array, r=echou,qdot 2013-04-16 11:10:29 +02:00
Eric Chou
83d8ea0931 Bug 861085 - Enable/Disable Bluetooth based on mozSettings value at startup, r=gyeh, r=qdot 2013-04-16 11:02:23 +08:00
Eric Chou
71d5471b39 Bug 823803 - Manage two server sockets (RFCOMM/EL2CAP) in BluetoothOppManager, r=mrbkap, r=gyeh 
In order to solve the problem, BluetoothOppManager should maintain
two server sockets at the same time, one is RFCOMM socket, another
is EL2CAP socket.
 2013-04-12 18:45:39 +08:00
Eric Chou
0f4f444972 Bug 823803 - Add L2CAP/EL2CAP Socket support, r=qdot, r=gyeh 
This version of BlueZ from Code Aurora has added GOEP_PSM to Object
Push Profile service record, which means that remote devices may
connect with us via both L2CAP and RFCOMM. This patch completes
L2CAP/EL2CAP socket implementation.
 2013-04-12 18:45:37 +08:00
Gina Yeh
14e690ffaf Bug 859727 - Should set force to FORCE_NONE after Sco is disconnected, r=echou 2013-04-12 16:27:21 +08:00
Kyle Machulis
993fd0dbcd Bug 844705 - Add comment to mReadFileThread. r=mrbkap 2013-04-09 12:11:00 -04:00
Eric Chou
1b53a5817c Bug 851046: Patch 9 - Small misc fixes; r=mrbkap 2013-04-04 17:56:16 -07:00
Eric Chou
8e91688a6f Bug 851046: Patch 8 - Add BluetoothSocket* as an argument of callback functions in BluetoothSocketObserver; r=mrbkap 2013-04-04 17:55:55 -07:00
Eric Chou
edadb6b84d Bug 851046: Patch 7 - Remove function ListenSocketViaService(); r=mrbkap 2013-04-04 17:55:34 -07:00
Eric Chou
d82896d95e Bug 851046: Patch 6 - Apply BluetoothSocket to BluetoothScoManager; r=mrbkap 2013-04-04 17:54:43 -07:00
Eric Chou
bf2f4be4a5 Bug 851046: Patch 5 - Apply BluetoothSocket to BluetoothHfpManager; r=mrbkap 2013-04-04 17:54:22 -07:00
Eric Chou
30bb590e64 Bug 851046: Patch 4 - Apply BluetoothSocket to BluetoothOppManager; r=mrbkap 2013-04-04 17:53:08 -07:00
Eric Chou
a0b0306990 Bug 851046: Patch 3 - Replace (Bluetooth*Managers)->CloseSocket() with (Bluetooth*Managers)->Disconnect(); r=mrbkap 2013-04-04 17:52:48 -07:00
Eric Chou
4d042d6bbd Bug 851046: Patch 2 - New Class: BluetoothSocket; r=mrbkap 2013-04-04 17:52:12 -07:00
Eric Chou
dccf48bebb Bug 851046: Patch 1 - New interface: BluetoothSocketObserver; r=mrbkap 2013-04-04 17:51:35 -07:00
Matt Brubeck
81b4a55b18 Back out bug 851046 because of rebase problems 2013-04-04 17:45:06 -07:00
Eric Chou
a92a872e72 Bug 851046: Patch 9 - Small misc fixes; r=mrbkap 
--HG--
extra : rebase_source : 12eb0cc3cdd6f8773ae9e503267dbf643f767cfc
 2013-04-04 17:25:45 -07:00
Eric Chou
88a57f941c Bug 851046: Patch 8 - Add BluetoothSocket* as an argument of callback functions in BluetoothSocketObserver; r=mrbkap 
--HG--
extra : rebase_source : 0c3e6e78f59b83faf7c81892974505caa1b1723a
 2013-04-04 17:25:44 -07:00
Eric Chou
aa759d45b9 Bug 851046: Patch 7 - Remove function ListenSocketViaService(); r=mrbkap 
--HG--
extra : rebase_source : eb7d4a12566722c759c9badda579fe66ef689ff1
 2013-04-04 17:25:44 -07:00
Eric Chou
7eed674e53 Bug 851046: Patch 6 - Apply BluetoothSocket to BluetoothScoManager; r=mrbkap 
--HG--
extra : rebase_source : 1b005af7999f8136a2d503e708d255c5a8ed8eb9
 2013-04-04 17:25:44 -07:00
Eric Chou
c841ea1f5b Bug 851046: Patch 5 - Apply BluetoothSocket to BluetoothHfpManager; r=mrbkap 
--HG--
extra : rebase_source : ec6e75948230e4b94d2d539833dc9899444d9afe
 2013-04-04 17:25:44 -07:00
Eric Chou
7974514d04 Bug 851046: Patch 4 - Apply BluetoothSocket to BluetoothOppManager; r=mrbkap 
--HG--
extra : rebase_source : 86f3d7acbfa097f92a2731d49ff5298ab4ad7a7c
 2013-04-04 17:25:44 -07:00
Eric Chou
e200a451bc Bug 851046: Patch 3 - Replace (Bluetooth*Managers)->CloseSocket() with (Bluetooth*Managers)->Disconnect(); r=mrbkap 
--HG--
extra : rebase_source : 43524216294e08625619b5b1c6a35e0de9fadde6
 2013-04-04 17:25:44 -07:00
Eric Chou
989000dc56 Bug 851046: Patch 2 - New Class: BluetoothSocket; r=mrbkap 
--HG--
extra : rebase_source : 692fc69bc24a212621a5ff8a37fd17c237de9b20
 2013-04-04 17:25:44 -07:00
Ryan VanderMeulen
96b06b3745 Backed out 9 changesets (bug 851046) for B2G bustage on a CLOSED TREE. 2013-04-03 15:54:36 -04:00
Eric Chou
fd3ed87d6c Bug 851046 - Small misc fixes. r=mrbkap 
1. Rename mSocketStatus
2. Remove keyword enum
3. Remove null-checking after new Bluetooth*Manager instances
 2013-04-04 00:32:28 +08:00
Eric Chou
7a0dbd1170 Bug 851046 - Add BluetoothSocket* as an argument of callback functions in BluetoothSocketObserver. r=mrbkap 
A Bluetooth*Manager may hold more than one BluetoothSocket at a time, therefore
we need to identify the caller (which socket calls the callback function).
 2013-03-19 17:08:44 -07:00
Eric Chou
b98cd3e0f0 Bug 851046 - Remove function ListenSocketViaService(). r=mrbkap 
Since we are now using BluetoothSocket directly for listening, this functions can be removed.
 2013-03-19 13:53:43 -07:00
Eric Chou
44c9b0ab22 Bug 851046 - Apply BluetoothSocket to BluetoothScoManager. r=mrbkap 2013-03-19 09:48:30 -07:00
Eric Chou
35a54afb18 Bug 851046 - Apply BluetoothSocket to BluetoothHfpManager. r=mrbkap 2013-03-15 18:45:59 +08:00
Eric Chou
11a31e69bd Bug 851046 - Apply BluetoothSocket to BluetoothOppManager. r=mrbkap 2013-03-15 17:47:35 +08:00
Eric Chou
d11f230c13 Bug 851046 - Use (Bluetooth*Managers)->Disconnect() instead of (Bluetooth*Managers)->CloseSocket() since managers are not UnixSocketConsumer anymore. r=mrbkap 2013-03-15 14:55:19 +08:00
Eric Chou
2ef6d8052f Bug 851046 - New class: BluetoothSocket. r=mrbkap 
After this new class is landed, communicating with other devices on
profile level should become more intuitive and reasonable. Each
Bluetooth*Manager doesn't need to inherit UnixSocketConsumer, instead,
BluetoothSocket inherits UnixSocketConsumer. That makes Bluetooth*Manager
be able to have more than 1 Bluetooth connections at a time with different
remote devices.
 2013-02-26 11:16:36 +08:00
Eric Chou
a1daa49eb6 Bug 851046 - New interface: BluetoothSocketObserver. r=mrbkap 
For those instances which want to be notified for any event sent
from a BluetoothSocket instance, they need to implement this
interface to get notification.
 2013-02-26 10:34:54 +08:00
Ehsan Akhgari
aa3139644f Bug 579517 follow-up: Remove NSPR types that crept in 2013-04-02 20:59:27 -04:00
Jose Cortes
e1b04f4398 Bug 842186 - Replace use of jsval with JS::Value in h and cpp files in the dom/telephony dom/bluetooth directories. r=jwalden 
--HG--
extra : rebase_source : c1560ea8c79fbb398d3e8f132e561e7eba81520a
 2013-04-02 16:06:14 -07:00
Kyle Machulis
f5e3aadf0b Bug 855465 - Add emacs python mode comments to moz.build files; r=gps 2013-04-01 11:36:59 -07:00
Ms2ger
36911ab252 Bug 853158 - Update the uuid of nsIDOMEventTarget and subclasses. 2013-03-30 10:45:37 +01:00
Kyle Machulis
d2b6e6e01a Backout for changeset 03452b187c14 (Bug 855465) due to bustage on a CLOSED TREE; r=qdot 2013-03-29 15:12:58 -07:00
Kyle Machulis
5663b98bc5 Bug 855465 - Add emacs python mode comments to moz.build files; r=gps 
--HG--
extra : rebase_source : 004a756492323e1a049586e85b3be5037159df20
 2013-03-29 13:56:18 -07:00
Gina Yeh
a14ed7a5d2 Bug 853200 - Remove unused event handlers from idl, r=echou, sr=mrbkap 2013-03-28 18:05:58 +08:00
shuang
01e0bbbf11 Bug 841336 - Remove assertion in RunDBusCallback if platform is gonk, r=echou 2013-03-26 13:15:09 +08:00
Gina Yeh
5dbcaead41 Bug 854347 - Failed to receive files after calcelling receiving a file, r=echou 2013-03-26 10:53:10 +08:00
Mike Shal
ea1d9b8ba7 Bug 844654 - Part 2: Move MODULE to moz.build; rs=gps 2013-03-19 11:47:00 -07:00
Kyle Machulis
33468072db Bug 843868: Change sockaddr* to be a union of all possible sockaddr types; r=tzimmermann 
--HG--
extra : rebase_source : 455aeb8c49bec2477a5ffea839a0ac3fe09434f7
 2013-03-19 10:23:47 -07:00
Phil Ringnalda
eabae506e4 Back out b21345c5027c (bug 843868) for build bustage 
CLOSED TREE
 2013-03-15 21:35:25 -07:00
Kyle Machulis
b0d7eb4341 Bug 843868 - Change sockaddr* to be a union of all possible sockaddr types; r=tzimmermann 
--HG--
extra : rebase_source : 9b980684b37e2e3345414af494ddb22e6c710e52
 2013-03-15 21:10:40 -07:00
Gina Yeh
418152901b Bug 834590 - Cache adapter path in BluetoothService, r=echou 2013-03-15 15:15:47 +08:00
Gregory Szorc
56a7634c1c Merge mozilla-central into build-system 2013-03-13 08:20:09 -07:00
Gregory Szorc
3d694a85c0 Merge mozilla-central into build-system 
dom/interfaces/svg/Makefile.in and dom/media/Makefile.in had merge
conflicts. They were resolved by hand. The former needed 2 IDLs removed.
The latter had a context conflict for EXPORTS_NAMESPACES.
 2013-03-12 13:04:55 -07:00
Mike Shal
2eb7c496cb Bug 818246 - Part 7: Move XPIDL_MODULE to moz.build; rs=gps 2013-03-11 22:00:00 -07:00
Gregory Szorc
0d33ac5f93 Bug 818246 - Part 5: Move XPIDLSRCS into moz.build (manual); r=glandium 2013-03-12 10:20:41 -07:00
Thomas Zimmermann
1a074deaa0 Bug 843958: Support SCO in switch statement; r=qdot r=echou 
The fix for bug 843958 makes b2g crash when Bluetooth gets turned
on. This patch fixes the affected switch statement.

--HG--
extra : rebase_source : dd903b58f7675dec0c1aae86a7a790ff11296db0
 2013-03-12 14:27:59 -07:00
Kyle Machulis
f0ee0d9367 Bug 843958 - Fix compiler warning for SCO not handling LM; r=echou 2013-03-10 22:37:15 -07:00
Olli Pettay
8f72caeb73 Bug 822399 - Make Event to use Paris bindings, r=peterv 2013-03-09 13:34:29 +02:00
Eric Chou
7ad8ab6e26 Bug 836715 - Fix potential memory problem in RemoveDeviceTask, r=qdot 
From 6e3780271509a502462560717f7cc768dafb673b Mon Sep 17 00:00:00 2001
 2013-03-04 18:47:41 +08:00
Eric Chou
1278a17f48 Bug 841984 - Fixed potential memory problem in SetProperty(), r=qdot 2013-03-08 12:10:09 +08:00
Eric Chou
960e073d4c Bug 841576 - Check if nsTHashtable has been initialized before calling Init(), r=qdot 2013-03-07 21:36:13 +08:00
Vicamo Yang
fecf389c8b Bug 834160 - Part 5/7: fix Telephony. r=smaug, f=htsai 
--HG--
rename : dom/bluetooth/BluetoothRilListener.cpp => dom/bluetooth/BluetoothTelephonyListener.cpp
rename : dom/bluetooth/BluetoothRilListener.h => dom/bluetooth/BluetoothTelephonyListener.h
 2013-03-06 17:53:23 +08:00
Eric Chou
3e4f0de951 Bug 848414 - Reply with ERROR to unknown AT commands, r=gyeh 2013-03-12 13:46:43 +08:00
Gina Yeh
261c4830ca Bug 846647 - Update call state before reseting call array, r=echou 2013-03-02 12:04:59 +08:00
Ms2ger
2801c25ab8 Merge m-c to b-s. 2013-02-26 19:09:25 +01:00
Gina Yeh
d86c245b78 Bug 844705 - Should send socket data in main thread, r=echou 2013-02-26 18:53:44 +08:00
Gregory Szorc
3fd0b2c59d Bug 784841 - Part 18k: Convert /dom; f=Ms2ger rs=khuey 2013-02-25 12:47:20 -08:00
Gina Yeh
cbe23cf219 Bug 844705 - Should send socket data in main thread, r=echou 2013-02-25 18:49:18 +08:00
Gina Yeh
d327d0163b Bug 844707 - Fix warnings in debug build, r=echou 2013-02-25 15:04:38 +08:00
Gina Yeh
73b038ddfa Bug 830551 - Send file-transfer-complete message after receiving unexpected response code from remote, r=echou 2013-02-25 12:40:31 +08:00
Gina Yeh
2f19e49764 Bug 842471 - Invalid value type in BluetoothDevicePropertiesRunnable(), r=echou 2013-02-20 14:19:34 +08:00
Shawn Huang
c7f157fbcc Bug 833206 - Remove invalid OBEX header: ConnectionId, r=gyeh, r=echou 2013-02-19 10:58:03 +08:00
Eric Chou
8ecf12ec3a Bug 842214 - Replace JS_NewStringCopyN with JS_NewUCStringCopyN, or non-ascii chars would be shown incorrectly, r=gyeh 2013-02-18 16:02:23 +08:00
Peter Van der Beken
7e3e8c9052 Fix for bug 839529 (Remove various CC participants that don't do anything). r=smaug. 
--HG--
extra : rebase_source : 8a272905c79396e7ae08aaaf83566ac450c45be0
 2013-02-07 10:19:08 +00:00
Gregor Wagner
d423f75f1d Bug 841590 - Bluetooth: Fix hashtable remove. r=bent 2013-02-14 16:45:13 -08:00
Eric Chou
e08bf536bc Bug 834816 - Disconnect all acl connections before disabling Bluetooth, r=qdot 2013-02-14 23:16:37 +08:00
Gina Yeh
c6d8aea525 Bug 838421 - After an instance of BluetoothAdapter is destroyed, no events can be received by other instances, r=echou 2013-02-08 18:03:09 +08:00
Gina Yeh
3e4a251da0 Bug 838499 - Assertion failed in function SetJsObject(), r=echou 2013-02-06 20:07:27 +08:00
Eric Chou
5a8c8d0037 Bug 836516 - Set a system property so that WLAN firmware could be aware of BT operations, r=gyeh 
Solution was provided by ggrisco@codeaurora.org
 2013-02-06 15:28:04 +08:00
Gina Yeh
7f762c6b66 Bug 838080 - Cannot receive all events after a series of actions, r=echou 2013-02-06 09:35:29 +08:00
Eric Chou
8fe7980217 Bug 838089 - Blacklisted AT commands: AT+XAPL/AT+XEVENT, r=gyeh 2013-02-05 19:19:15 +08:00
Vicamo Yang
20050ee452 Bug 826931 - Part 1/3: UnixSocket - allow ownership take-over in ReceiveSocketData(). r=qDot,echou 2013-02-01 20:28:15 +08:00
shuang
fb75f92e79 Bug 828837:Fix COD equals 0x20080c cause icon empty, r=echou 2013-02-01 17:04:07 +08:00
Eric Chou
05e5b054bb Bug 835474 - Assign length of the message with aMessage->mSize, r=gyeh 2013-01-30 12:58:40 +08:00
Gina Yeh
53892a4c30 Bug 835740 - Modified BRSF value in hands-free profile, r=echou 2013-01-30 12:33:23 +08:00
Eric Chou
492be7deab Bug 834551 - Insert BT_LOG at several important check points, r=gyeh 2013-01-29 18:37:51 +08:00
Eric Chou
3c923fe145 Bug 834551 - Replace 'LOG()' with 'BT_WARNING()' defined in BluetoothCommon.h for consistency, r=qdot 2013-01-29 18:37:51 +08:00
Eric Chou
dea952907e Bug 834551 - Add Bluetooth debugging flag, r=qdot 2013-01-29 18:37:51 +08:00
Gina Yeh
9ae2cfbdcb Bug 811569 - Patch 4: Remove asynchronous function GetProperty , r=echou 2013-01-29 14:52:58 +08:00
Gina Yeh
86d8eef233 Bug 811569 - Patch 3: Cleanup for DOMRequest related checking and do_GetService checking, r=echou 2013-01-29 14:52:48 +08:00
Gina Yeh
b63992289e Bug 811569 - Patch 2: Support array of nsString in SetJsObject, r=echou 2013-01-29 14:52:39 +08:00
Gina Yeh
f1698ce19d Bug 811569 - Patch 1: Remove unused files in bluetooth, r=echou 2013-01-29 14:52:30 +08:00
Ed Morley
4083c0c3a6 Backout 3985cb4da6b6, 55ab9f026dc4, f7ead00b7654 and e2108ea96ae5 for a variety of build failures on a CLOSED TREE 2013-01-28 12:19:12 +00:00
Gina Yeh
58be7621b3 Bug 828798 - [Bluetooth] [HFP] No redundant +CIEV commands are sent to bluetooth headset, r=echou 2013-01-28 19:28:51 +08:00
Eric Chou
2ae028d66d Bug 834551 - Insert BT_LOG at several important check points, r=gyeh 2013-01-28 19:23:15 +08:00
Eric Chou
1aa08b1878 Bug 834551 - Replace 'LOG()' with 'BT_WARNING()' defined in BluetoothCommon.h for consistency, r=qdot 2013-01-28 19:23:12 +08:00
Eric Chou
f0e65f18cb Bug 834551 - Add Bluetooth debugging flag, r=qdot 2013-01-28 19:23:02 +08:00
Gina Yeh
af7eb8c24b Bug 827230 - [Bluetooth] [Hfp] Support feature 'Query Operator Selection' (AT+COPS?), r=echou, a=nonlibxul 2013-01-23 09:22:08 +08:00
Gina Yeh
1a8309d87f Bug 823346 - [Bluetooth] [Hfp] Updating status change of Battery level, r=echou, a=nonlibxul 2013-01-22 13:53:28 +08:00
Steve Fink
d3f194fbfb Bug 828753 - jsid rooting, mostly in jsinfer.*. Also switch JSObject from struct to class. r=terrence 2012-12-31 12:40:21 -08:00
Steve Fink
cb8aecdd2a Backed out changeset fce4e0f8a553 (bug 828753) for breaking windows warnings-as-errors (stop adding JSObject forward decls, please!) 2013-01-18 13:20:21 -08:00
Steve Fink
fa3e8f224b Bug 828753 - jsid rooting, mostly in jsinfer.*. Also switch JSObject from struct to class. r=terrence 
--HG--
extra : rebase_source : c8806b27677594925ad0e6b54c47af5cf17e1153
 2012-12-31 12:40:21 -08:00
Gina Yeh
4d76e6a416 Bug 828175 - Patch 1: [Bluetooth] [Hfp] Error handling for AT+CHLD command, r=echou 2013-01-18 18:53:00 +08:00
Trevor Saunders
b98e34aed0 bug 822289 - remove NS_IMPL_CYCLE_COLLECTION_CLASS and friends r=mccr8 2013-01-12 07:40:33 -05:00
Eric Chou
00071bde2e Bug 825762 - Replace VFAT reserved character with '_' to avoid file-transferring failure, r=qdot 2013-01-16 18:23:28 +08:00
Gina Yeh
4a0934bf5d Bug 827266 - Patch 1: [Bluetooth][Hfp] Support 'call waiting notification activation', r=echou 2013-01-16 14:17:41 +08:00
Gina Yeh
9abae52a61 Bug 827212 - Patch 2: Support feature 'Enhanced call status indications', r=echou 2013-01-16 14:13:58 +08:00
Gina Yeh
fb12b3fab9 Bug 827212 - Patch 1: Move functions from public to private in BluetoothHfpManager, r=echou 2013-01-16 14:13:41 +08:00
Eric Chou
49de3daaec Bug 829473 - Fix a wrong conditional check resulted from bug 827204, r=gyeh 2013-01-11 10:45:28 +01:00
Gina Yeh
a478eef093 Bug 827255 - Patch 1: Enable AG error result code, r=echou 2013-01-11 14:00:04 +08:00
Thomas Zimmermann
eb0a50ab1b Bug 827888: Fix usage of sIsParing variable [r=echou,qdot] 
The variable sIsPairing signals to the Bluetooth pairing response
notifier if pairing is still requested.

Being a boolean value, the variable only supported one pairing request
at a time. To support multiple parallel pairing requests, this patch
converts it into a counter. The counter is atomic, because notifier
calls run in separate threads.

Additionally, we now set sIsPairing before starting the pairing request.
Otherwise the notifier might run before we can increment the variable.
 2013-01-10 07:55:43 -08:00
Gina Yeh
8db38c00a3 Bug 828811 - After OPP session disconnected, wait for 1 sec and close socket actively if the socket is still connected, r=echou 2013-01-10 15:14:16 +01:00
Eric Chou
f354fcba12 Bug 827759 - Remove all listeners except BluetoothManagers, r=qdot 2013-01-09 16:51:53 +01:00
Doug Turner
fd87c9795b Bug 827311 - Remote file update notifications. r=bent a=blocking-basecamp 2013-01-09 07:03:28 -08:00
Gina Yeh
c3a150b672 Bug 828118 - Patch 1: Failed to answer a phone call when bluetooth headset quickly send out ATA message, r=qdot 2013-01-09 17:37:08 +08:00
Gina Yeh
0da5c46ee6 Bug 827204 - Patch 1: Activate/Deactivate indicator events reporting, r=echou 2013-01-09 14:05:34 +08:00
Eric Chou
288fe38cb1 Bug 827267 - Added function IsTransferring() to distinguish if there is an ongoing file-transferring session, r=gyeh 2013-01-08 14:02:00 +01:00
Gina Yeh
144f9078f5 Bug 825861 - Patch 1: Support feature: Ability to transmit DTMF codes, r=echou 2013-01-08 17:21:00 +08:00
Gina Yeh
7f8c24d794 Bug 825851 - Patch 1: Handle AT command: AT+VGM, r=echou 2013-01-07 16:58:59 +08:00
Gina Yeh
af2eca651a Bug 826463 - Patch 1(v1): After disconnect BT headset while in-call, audio rerouting takes too long, r=echou 2013-01-05 12:34:19 +08:00
Eric Chou
b401fae1ce Bug 824895 - check if mConnection is ready before running SetProperty(), r=gyeh 2013-01-02 16:33:37 +08:00
Eric Chou
153b52e18d Bug 820216 - should use JS_NewUCStringCopyN to copy a Unicode string, r=gyeh 2012-12-27 10:20:17 +08:00
Eric Chou
8bb47d0605 Bug 824458 - callback function set in DBus sometimes wouldn't get called, r=gyeh 2012-12-25 14:56:26 +08:00
Ms2ger
519fc6202b Merge PGO-green changeset from inbound to m-c. 2012-12-22 12:06:37 +01:00
Ms2ger
3eb0a0a781 Bug 823107 - Make nsIDOMEvent::SetTrusted return void; r=smaug 2012-12-22 09:18:08 +01:00
Eric Chou
7448b00492 Bug 811683 - Increase speed of sending file, r=gyeh 2012-12-20 18:36:58 +08:00
Kyle Machulis
6480dccd69 Bug 811683 - Changed UnixSocketRawData to take variable sizes up to 64k, r=cjones 2012-12-20 18:36:55 +08:00
Gina Yeh
ab7fa4543d Bug 820157 - Patch 1: bluetooth Hfp not sending status updates, r=echou 2012-12-20 15:28:51 +08:00
Justin Lebar
1ce158bdfa Bug 819791 - Part 7: Use explicit TArray copy constructors in Bluetooth code. r=qdot 2012-12-18 20:16:06 -05:00
Eric Chou
b018b56a3e Bug 820143 - implemented Calling Line Identification (CLI), r=gyeh 2012-12-17 23:24:35 +08:00
Gina Yeh
f880e8281e Bug 820103 - Patch 1: bluetooth Hfp memory dialing and Hfp supplied number not supported, r=echou 2012-12-17 17:51:38 +08:00
Gina Yeh
1f9d3af22a Bug 821636 - Patch 1: No subscriber number information in Bluetooth Handsfree, r=echou 2012-12-17 17:44:32 +08:00
Eric Chou
f9e4239e60 Bug 823427 - Remove unnecessary buffer in ObexBase.cpp, r=gyeh, r=dholbert 2012-12-21 19:03:42 +08:00
Gina Yeh
4430275e7a Bug 823455 - Patch 1: Fire ondisabled/onenabled event when toggling is failed, r=echou 2012-12-21 18:22:58 +08:00
Eric Chou
26eda1702d Bug 814341 - fix memory leak in Bluetooth, r=gyeh 2012-12-13 20:12:04 +08:00
Eric Chou
1e4ac50d8b Bug 815079 - notify DeviceStorage when a file is received and saved, r=dougt 2012-12-12 16:54:54 +08:00
Eric Chou
2163cdf657 Bug 818696 - prevent "pairing failed" prompt from appearing after re-enabling Bluetooth, r=gyeh 2012-12-11 19:31:47 +08:00
Ed Morley
db9fdcb9c5 Backout 8288c4940d1e (bug 818696) for crashes 2012-12-11 12:53:37 +00:00
Eric Chou
ff2cd83c25 Bug 818696 - prevent "pairing failed" prompt from appearing after re-enabling Bluetooth, r=gyeh 2012-12-11 19:31:47 +08:00
Gina Yeh
7f9c4a487a Bug 819832 - Patch 1: Sending files to Mac would fail at the end of sending process, r=echou 2012-12-11 13:55:37 +08:00
Gina Yeh
e2f5a413f3 Bug 817930 - Patch 1: Support for receiving multiple files sequentially, r=echou 2012-12-07 20:12:57 +08:00
Ms2ger
6546506458 Bug 814898 - Part c: Cleanup CC goop in B2G-specific parts of dom/; r=mccr8 2012-12-02 09:54:37 +01:00
Gina Yeh
f4b0edd507 Bug 816859 - Patch 1: Failed to receive a file, r=echou 2012-11-30 17:49:08 +08:00
Gina Yeh
726dc442eb Bug 815325 - Patch 1: Turning bluetooth on and off multiple times causes restart, r=echou 2012-11-30 17:46:55 +08:00
Boris Zbarsky
69ab92b7a0 Bug 815671 part 5. Various miscellaneous fixups in dom/ and hal/ code to copy arrays only when we explicitly want to. r=jlebar 2012-11-29 11:14:14 -05:00
Ehsan Akhgari
a7a98ebf22 Merge mozilla-central into mozilla-inbound 2012-11-28 09:43:30 -05:00
Olli Pettay
f62ac2c85e Bug 811206, Fix JSHolder drop handling, part 3 (fixes), r=mccr8,khuey 
--HG--
extra : rebase_source : 7b2726d2aa7f5764a3c4cb750e5a735728069687
 2012-11-28 03:37:57 +02:00
Gina Yeh
28fa682ce9 Bug 813817 - Patch 1: Cancelling file transferring doesn't clear the notifications, r=echou 2012-11-28 15:59:20 +08:00
Eric Chou
df73d06773 Bug 811946 - remove annoying compiler warnings and define a more structured interface for Bluetooth uuid, r=qdot 2012-11-27 14:12:19 +08:00
Eric Chou
b054d8bf3d Bug 814376 - Improve the mechanism for setting file extension of a blob, r=sicking 2012-11-26 20:51:29 +08:00
Gina Yeh
48a785ad3d Bug 814555 - Patch 1: After hanging up the phone, still ring tone from bluetooth, r=echou 2012-11-26 10:35:55 +08:00
Eric Chou
56866e71cd Bug 812412 - replace full path with leaf name only, r=dougt 2012-11-21 15:53:19 +08:00
Gina Yeh
3d1f39fe89 Bug 812430 - Patch 1: First time connected by laptop would show empty pairing message, r=echou 2012-11-21 15:33:07 +08:00
Gregor Wagner
ff18bc3e05 Bug 815572 - Standardize the Bluetooth permissions name to "bluetooth". r=qdot 2012-11-27 12:10:47 -08:00
Gina Yeh
e9e59bb835 Bug 812391 - Patch 1: Support audio stream of bt_sco, r=echou 2012-11-19 15:10:38 +08:00
Gina Yeh
b0a4410c20 Bug 812404 - Patch 1: Crash when connect with a bluetooth headset right after pairing completed, r=echou 2012-11-16 18:46:08 +08:00
David Zbarsky
5832069b20 No bug, fix struct/class mismatch warnings 2012-11-14 21:38:26 -05:00
Gregor Wagner
2beb19246d Bug 811414 - nsISettingsServiceCallback shouldn't use [implicit_jscontext]. r=bholley 2012-11-14 13:46:38 -08:00
Gregor Wagner
e37ae07500 Backout Bug 811414 for breaking B2G 2012-11-14 13:09:21 -08:00
Gregor Wagner
c42015b882 Bug 811414 - nsISettingsServiceCallback shouldn't use [implicit_jscontext]. r=bholley 2012-11-14 13:00:51 -08:00
Gina Yeh
86a925698d Bug 811196 - Patch 1: Cannot receive call status change from RIL, r=echou 2012-11-14 19:25:19 +08:00
Eric Chou
d8f46ca6c7 Bug 809781 - Fixed sending file failure, r=gyeh 2012-11-14 14:29:11 +08:00
Eric Chou
3067828e84 Bug 809538 - refactory and handle no sdcard situation, r=qdot 2012-11-07 17:46:31 -08:00
Gina Yeh
96c427811f Bug 809515 - Patch 1: No response when failed to connect to a headset, r=qdot 2012-11-07 15:48:39 -08:00
Gina Yeh
9356d6f411 Bug 808879 - Patch 1: Expose connection status for system app, r=qdot, sr=mrbkap 2012-11-07 10:12:41 -08:00
Eric Chou
843f440877 Bug 808193 - return 'boolean' if PROP_DEVICE_CONNECTED_TYPE is not found, r=qdot 2012-11-05 15:48:34 -08:00
Eric Chou
b701e28abf Bug 805724 - patch 5: sent correct file name to Gaia and removed received incomplete file, r=qdot 2012-11-03 09:36:49 +08:00
Eric Chou
8b005928a8 Bug 805724 - patch 4: fire dom request events after calling OPP related functions, r=qdot 2012-11-03 09:36:43 +08:00
Eric Chou
96688ab58b Bug 805724 - patch 3: let user be able to terminate receiving process by calling StopSendingFile(), r=qdot 2012-11-03 09:36:39 +08:00
Eric Chou
81a30c2d7a Bug 805724 - patch 2: cleanup (naming, check text width, decrease build warnings), r=qdot 2012-11-03 09:36:34 +08:00
Eric Chou
589fd9f27c Bug 805724 - patch 1: made BluetoothOppManager listen again after disconnection, r=qdot 2012-11-03 09:36:19 +08:00
Kyle Machulis
958f7ce497 Bug 791268: Make dylib symbol binding retry, let bluetooth firmware shutdown still work even on error; r=echou 
--HG--
extra : rebase_source : f17ca1a8d3fe84a73cab3c4e0db56ee4f15fe0d1
 2012-11-02 13:16:45 -07:00
Gina Yeh
bcedd516f7 Bug 806713 - Patch 1: NS_ASSERTION failure in UnixSocket.cpp when create a sco socket, r=qdot 2012-11-01 19:49:07 +08:00
Kyle Machulis
dd6c2f64b9 Bug 802428: Support varying adapter properties based on android version; r=ggrisco r=echou 
--HG--
extra : rebase_source : 7e469ae48df6aef480e882e196ee901c27702aa8
 2012-10-31 20:24:54 -07:00
Kyle Machulis
fc10cda9d6 Backed out changeset f57c433cb7bc: Wrong patch version r=echou r=qdot 
--HG--
extra : rebase_source : 51f68f0f2c32ac4f41d0bd8fb21f323331ae3418
 2012-10-31 20:24:15 -07:00
Kyle Machulis
695cda70aa Bug 802428: Support varying adapter properties based on android version; r=ggrisco r=echou 
--HG--
extra : rebase_source : 7acc2d356afd1578ea9f6266e2056eb9f02571e1
 2012-10-31 13:45:50 -07:00
Gina Yeh
da21466684 Bug 806296 - Patch 1(v1): Cannot create an encrypted socket, r=echou 2012-10-31 17:33:50 +08:00
Eric Chou
a9188419f9 Bug 802080 - Update connected device address, r=qdot 2012-10-31 14:07:06 +08:00
Gina Yeh
ded6b4945d Bug 805708 - Patch 1: Cannot answer a waiting call during a phone call when press the headset, r=qdot 2012-10-31 11:53:36 +08:00
Eric Chou
b3ac908c1d Bug 803614 - [b2g-bluetooth] Save received file, r=qdot, r=dougt 2012-10-31 11:15:12 +08:00
Gina Yeh
27d5f025df Bug 803475 - Failed to transfer audio back to bluetooth headset while in a phone call, r=qdot 2012-10-26 17:48:47 +08:00
Gina Yeh
ed4e98a56b Bug 804436 - Patch 2 : Failed to connect from a headset again after turn off and turn on the headset, r=qdot 2012-10-26 17:28:39 +08:00
Gina Yeh
3496a5673d Bug 804474 - Null address value in system message of "bluetooth-hfp-status-changed", r=qdot 2012-10-26 17:21:32 +08:00
Kyle Machulis
79b67fcf1d Bug 802288: Make BluetoothOppManager shutdown at xpcom-shutdown event; r=echou 2012-10-25 18:25:46 -07:00
Kyle Machulis
c037938471 Bug 804687: Remove sHfpCommandThread from BluetoothHfpManager; r=echou 2012-10-25 18:25:15 -07:00
Gina Yeh
b09af8f769 Bug 804460 - Patch 1: Failed to set audio stream volume to correct value by bluetooth headset, r=qdot 2012-10-25 18:50:41 +08:00
Gina Yeh
0c2ef57514 Bug 800695 - Final version: Audio route is set to sco before connecting to a bluetooth headset, r=qdot 2012-10-22 18:34:15 +08:00
Eric Chou
af3f4360b3 Bug 802590 - Patch 3: Implemented the logic, r=qdot 2012-10-19 14:16:13 +08:00
Eric Chou
99997a7a1d Bug 802590 - patch 2: IPC implementation, r=qdot 2012-10-19 14:16:13 +08:00
Eric Chou
bf2e07fff1 Bug 802590 - patch 1: DOM API change, sr=mrbkap, r=qdot 2012-10-19 14:16:13 +08:00
Gabriele Svelto
59704eda24 Bug 798123 - Replace the array conversion functions in BluetoothUtils.cpp with those in nsTArrayHelpers.h. r=mrbkap 2012-10-18 15:20:54 +02:00
Kyle Machulis
108cfcce82 Bug 800249 - Patch 2: Add ability to retreive connected socket address as a string; r=cjones 2012-10-17 17:11:05 -07:00
Eric Chou
57f389b14e Bug 799452 - patch 2: Parse PUT request header, r=qdot 2012-10-17 14:48:52 +08:00
Eric Chou
713ac55207 Bug 799452 - Patch 1: Send a system message to notify 'receiving file confirmation', r=qdot 2012-10-17 14:46:53 +08:00
Eric Chou
efa31c66f2 Bug 801507 - Listen to ObjectPush service socket, r=qdot 2012-10-15 14:16:41 +08:00
Kyle Machulis
c9010dc7b5 Bug 800247: Add disconnect events to UnixSocket, update Bluetooth*Manager; r=echou r=cjones 
--HG--
extra : rebase_source : 809d46954baea51bf4053c3a48ce45b18b1a58e9
 2012-10-12 11:38:14 -07:00
Ehsan Akhgari
d5bdf2232e Bug 779473 - Fix some nsresult abuses in the Bluetooth implementation 2012-10-13 10:45:45 -04:00
Eric Chou
07d66eaabb Bug 800313 - Refine system messages interface for bluetooth file-sharing app, r=qdot 2012-10-12 19:14:21 +08:00
Kyle Machulis
bb7e8fcc13 Bug 796176 - Patch 2: Make Bluetooth*Managers listen on startup/disconnect, stop listening to stop/connect; r=echou 
--HG--
extra : rebase_source : 9ed9b4cc1ba445128a8ff6f90a9fb84044b7ca1a
 2012-10-10 22:49:11 -07:00
Gina Yeh
0764e1f8c2 Bug 794349 - Final version: Send correct +CIND: value to HS at SLC establishment, r=qdot 2012-10-09 19:19:29 +08:00
Eric Chou
9deb66e457 Bug 799138 - [b2g-bluetooth] Handle Connect/Disconnect/Put requests sent from remote devices, r=qdot 2012-10-09 13:56:17 +08:00
Kyle Machulis
93c1dcc69d Bug 799243 - Patch 2: Fix static nsTArray initialization in BluetoothDBusService; r=echou 2012-10-08 22:00:02 -07:00
Kyle Machulis
c94d7c60a8 Bug 799243 - Patch 1: Fix Bluetooth*Manager observer pointer types; r=echou 2012-10-08 21:59:33 -07:00
Gina Yeh
ea5b6c5f71 Bug 782586 - Final version: Firing onadapteradded event when bluetooth is ready to get default adapter, r=qdot 2012-10-09 11:29:37 +08:00
Kyle Machulis
87533d6be9 Bug 798035 - Patch 2: Bluetooth SCOManager Cleanup; r=gyeh 
--HG--
extra : rebase_source : 4509998c8d685cf510861ebc06616387dca6444f
 2012-10-05 19:16:43 -07:00
Kyle Machulis
9980beeddc Bug 798035 - Patch 1: Change Bluetooth*Manager observers to be internal classes; r=gyeh 
--HG--
extra : rebase_source : 511e9c9deec5626399fc76c0630ac4ca8285a40e
 2012-10-05 17:11:24 -07:00
Kyle Machulis
0e56497b27 Bug 796184 - Revert UnixSocketImpl to a bare pointer, make Bluetooth*Managers use CloseSocket; r=cjones r=gyeh 
--HG--
extra : rebase_source : fe8f4633eb9fb86ffc4a87e6b483b3357ab9896d
 2012-10-05 16:05:35 -07:00
Gina Yeh
771f15de9f Bug 797810 - Patch 2: Cleanup for profile connect function, r=qdot 2012-10-05 18:48:05 +08:00
Gina Yeh
062da8f922 Bug 797810 - Patch 1: Support command "AT+CKPD=200" in BluetoothHfpManager, r=qdot 2012-10-05 18:48:05 +08:00
Gina Yeh
e830f70fa8 Bug 797801 - Final version: Cannot receive agent events after crash, r=qdot 2012-10-05 17:19:31 +08:00
Eric Chou
c52ea871d2 Bug 797786 - Send system message 'Update progress', r=qdot 2012-10-05 16:11:21 +08:00
Eric Chou
866c32c47f Bug 797345 - send a system message to notify that 'file transfer completed', r=qdot 2012-10-03 17:06:40 +08:00
Gina Yeh
114a88c200 Bug 795659 - Final version: Follow-up to bug 795458, r=qdot 2012-10-04 11:13:12 +08:00
Eric Chou
aea8c16ff3 Bug 796329 - implemented StopSendingFile() and fixed potential memory problem, r=qdot 2012-10-03 15:09:27 +08:00
Gina Yeh
542564d392 Bug 796827 - Final version: Destroy BluetoothHfpManager instance while in shutdown, r=qdot 2012-10-03 13:53:39 +08:00
Gina Yeh
c5eb1365fc Bug 796829 - Final version: Destroy BluetoothScoManager instance while in shutdown, r=qdot 2012-10-03 11:27:36 +08:00
Gina Yeh
78c37a4bca Bug 796300 - Final version: Set audio device BLUETOOTH_SCO_HEADSET to unavailable when disconnect Sco socket, r=qdot 2012-10-03 10:55:28 +08:00
Gina Yeh
5d2d89e9b1 Bug 795850 - Final version: BluetoothHfpManager failed to be added as observer of mozsettings-changed, r=qdot 2012-10-02 11:00:33 +08:00
Ehsan Akhgari
4b71a98ab2 Bug 579517 follow-up: Remove NSPR types that crept in 2012-10-01 16:04:09 -04:00
Nathan Froyd
3c013d928f Bug 720768 - add nsDOMEventTargetHelper::DispatchTrustedEvent; r=mounir, sr=smaug 2012-09-27 16:11:31 -04:00
Gina Yeh
0be0dc67c7 Bug 795249 - Final version: Broadcast hfp connection status with system message, r=qdot 2012-10-01 15:44:48 +08:00
Kyle Machulis
57d3f019c3 Bug 790739: Patch 3 - Service and Manager changes for Bluetooth server sockets; r=cjones 2012-10-01 00:04:01 -07:00
Kyle Machulis
c5e6656fbb Bug 790739: Patch 2 - BluetoothSocketConnection changes for server sockets; r=cjones 2012-10-01 00:03:28 -07:00
Eric Chou
7676cacec8 Bug 795410 - patch 3: Get file content and send, r=qdot 
From 01ff8209cc5242bdf6c89432899ab4658e71e58a Mon Sep 17 00:00:00 2001
 2012-09-28 20:03:36 +08:00