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
158,570 Commits 1 Branch 166 Tags 1.2 GiB
4257a47b66
Commit Graph

1253 Commits

Author SHA1 Message Date
Gene Lian
4cc178f86f Bug 913436 - Gecko needs to return a proper error code when sending messages to non-FDN receivers. r=vicamo a=koi+ 2013-09-09 21:48:07 +08:00
Gene Lian
77e05493e7 Backed out changeset 9f377abbf13e 2013-09-09 21:22:37 +08:00
Gene Lian
415d896ad2 Bug 913436 - Gecko needs to return a proper error code when sending messages to non-FDN receivers. r=vicamo a=koi+ 2013-09-09 21:00:45 +08:00
Henry Chang
249cbee5b4 Bug 909786 - Use incremental id as the hash key of |controlCallbacks|. r=vchang 2013-08-27 23:38:10 +08:00
Szu-Yu Chen [:aknow]
b1ba92deb4 Bug 912884 - Part 2: Update test case. r=hsinyi 2013-09-09 08:19:49 -04:00
Szu-Yu Chen [:aknow]
90dbdfd71c Bug 912884 - Part 1: Always send out emergencyCbModeChange event when received from ril. r=hsinyi 2013-09-09 08:19:49 -04:00
Vicamo Yang
58db0e1752 Backout bug 907585, break B2G Mnw test cases 2013-09-07 19:32:23 +08:00
Vicamo Yang
00657cb9ec Backout bug 873351, break Mnw test cases. 2013-09-07 19:09:54 +08:00
Vicamo Yang
07643ef4e8 Bug 873351 - B2G SMS: move SMS code out of RadioInterfaceLayer to SmsService. r=gene 2013-09-07 14:20:19 +08:00
Vicamo Yang
a5824695df Bug 907585 [3/3]: some small refinements. r=yoshi 2013-09-07 14:20:11 +08:00
Vicamo Yang
54062665c7 Bug 907585 [2/3]: Re-implement message listener registration. r=yoshi 2013-09-07 14:20:07 +08:00
Vicamo Yang
6bb601750e Bug 907585 [1/3]: B2G RIL - share RilMessageManager. Move to RilMessageManager.jsm. r=yoshi,hsinyi 2013-09-07 14:20:04 +08:00
Vicamo Yang
8d3594c697 Bug 864485 - 3/3: Gonk backend specific. r=hsinyi 2013-09-07 14:19:57 +08:00
Vicamo Yang
e9a47488e4 Bug 864485 - 2/3: DOM & IPC. r=khuey 2013-09-07 14:19:53 +08:00
Ryan VanderMeulen
d32d9ebb4d Backed out 7 changesets (bug 907585, bug 873351, bug 864485) for making phones unbootable. 
Backed out changeset 001a849303de (bug 873351)
Backed out changeset 8020b3013618 (bug 907585)
Backed out changeset 9039460e09c5 (bug 907585)
Backed out changeset 9464e393a501 (bug 907585)
Backed out changeset d6920653de69 (bug 864485)
Backed out changeset 20ef446b27cd (bug 864485)
Backed out changeset e27c780e1ef5 (bug 864485)
 2013-09-06 17:28:10 -04:00
Thomas Zimmermann
c44d624ad1 Bug 912996: Remove memcpy when reading from Unix socket, r=qdot 
We used to allocate memory on the stack when reading from a file
descriptor and copied the result into an instance of UnixSocketRawData.

This patch

 - cleans up the interface of UnixSocketRawData,
 - removes the large stack allocation (64KiB), and
 - removes the unnecessary memcpy.

Other memcpys for sending data have been moved into the constructor
of UnixSocketRawData.

--HG--
extra : rebase_source : 46ed1c73481732c3f3350bf0bedb56d376c24e98
 2013-09-06 10:18:35 +02:00
Vicamo Yang
eac458c748 Bug 873351 - B2G SMS: move SMS code out of RadioInterfaceLayer to SmsService. r=gene 2013-09-06 16:11:54 +08:00
Vicamo Yang
69e2d5d6a7 Bug 907585 [3/3]: some small refinements. r=yoshi 2013-09-06 16:11:49 +08:00
Vicamo Yang
7058efe953 Bug 907585 [2/3]: Re-implement message listener registration. r=yoshi 2013-09-06 16:11:46 +08:00
Vicamo Yang
afd2d6b494 Bug 907585 [1/3]: B2G RIL - share RilMessageManager. Move to RilMessageManager.jsm. r=yoshi,hsinyi 2013-09-06 16:11:43 +08:00
Vicamo Yang
55560f0983 Bug 864485 - 3/3: Gonk backend specific. r=hsinyi 2013-09-06 16:11:38 +08:00
Vicamo Yang
349d13eac4 Bug 864485 - 2/3: DOM & IPC. r=khuey 2013-09-06 16:11:34 +08:00
Chia-hung Tai
c83d31326a Bug 911690 - Fix the forever spinning circle icon when sending SMS under no service. r=vyang 2013-09-06 10:25:06 +08:00
Ed Morley
3dfc516118 Merge mozilla-central and b2g-inbound 2013-09-05 14:53:25 +01:00
Shawn Ku
7b16e86b2a Bug 911006 - B2G RIL: Improve the flow of requestNetworkInfo in ril_worker.js. r=hsinyi 2013-09-05 14:51:48 +08:00
Ed Morley
be0545a9dd Backed out changeset 5f709b46eebc (bug 864485) 2013-09-05 11:52:35 +01:00
Ed Morley
73afdd110d Backed out changeset f6b637a621ac (bug 864485) 2013-09-05 11:52:32 +01:00
Vicamo Yang
eeb6b24ae1 Bug 864485 - 3/3: Gonk backend specific. r=hsinyi 2013-09-05 00:38:57 +08:00
Vicamo Yang
5b70de5220 Bug 864485 - 2/3: DOM & IPC. r=khuey 2013-09-05 00:38:54 +08:00
Wes Kocher
8bba56d03f Merge m-c to inbound 2013-09-04 18:04:50 -07:00
Mike Hommey
f1cf3b4238 Bug 912293 - Remove now redundant boilerplate from Makefile.in. r=gps 2013-09-05 09:01:46 +09:00
Edgar Chen
5163e81729 Bug 869778 - Part 5: GPS changes for msisdn. r=kchen 2013-08-21 10:45:57 +08:00
Szu-Yu Chen [:aknow]
b16be28c24 Bug 909684 - Add enabled and password checking. r=hsinyi 2013-09-03 08:50:55 -04:00
Vicamo Yang
883e2416aa Bug 909693 - B2G RIL: don't send REQUEST_QUERY_NETWORK_SELECTION_MODE error message. r=yoshi 2013-09-03 10:20:53 +08:00
Chia-hung Tai
662669be60 Bug 911026 - Fix the wrong argument pass through setMessageDeliveryByMessageId after enabling "Delivery reports". r=vyang 2013-09-02 12:05:55 +08:00
Edgar Chen
1fc3920e91 Bug 869778 - Part 3: RIL implementation for CDMA MIN. r=allstars.chh 2013-08-12 14:59:17 +08:00
Edgar Chen
0002638c10 Bug 869778 - Part 2: Move mbdn to iccInfoPrivate. r=allstars.chh 2013-08-21 00:48:11 +08:00
Szu-Yu Chen [:aknow]
85bc632c34 Bug 909669 - Part 2: Change error code to InvalidParameter (ril, test). r=hsinyi 2013-09-04 08:30:44 -04:00
Gene Lian
0847ca405b Bug 903403 - [sms][mms] Make getSegmentInfoForText() Asynchronous to Improve Typing Performance. r=vicamo, sr=mounir 2013-08-09 21:25:53 +08:00
Vicamo Yang
d770b8fa67 Bug 911341 - 2/2: Seperate the parcel header handling. r=yoshi 2013-09-04 18:58:26 +08:00
Vicamo Yang
b140739339 Bug 911341 - 1/2: B2G RIL - refactor worker_buf. r=yoshi 2013-09-04 18:58:23 +08:00
Ed Morley
983620f4cb Backed out changeset 9bd4fcd6d084 (bug 864485) 2013-09-04 11:51:02 +01:00
Ed Morley
342d44f56a Backed out changeset 89113a5b091e (bug 864485) 2013-09-04 11:50:59 +01:00
Ed Morley
034dd7c44a Backed out changeset 0b45d07ccdee (bug 907585) 2013-09-04 11:50:55 +01:00
Ed Morley
2910a0fbad Backed out changeset 0a1f354d13a0 (bug 907585) 2013-09-04 11:50:52 +01:00
Ed Morley
e62524208c Backed out changeset 21b97e0e5a10 (bug 907585) 2013-09-04 11:50:49 +01:00
Ed Morley
bb19dddab4 Backed out changeset 8b6235d4c2ac (bug 873351) 2013-09-04 11:50:46 +01:00
Vicamo Yang
eff88ee844 Bug 873351 - B2G SMS: move SMS code out of RadioInterfaceLayer to SmsService. r=gene 2013-09-04 15:53:50 +08:00
Vicamo Yang
bcdbae90bf Bug 907585 [3/3]: some small refinements. r=yoshi 2013-09-04 15:53:45 +08:00
Vicamo Yang
a7fcf45ed8 Bug 907585 [2/3]: Re-implement message listener registration. r=yoshi 2013-09-04 15:53:42 +08:00
Vicamo Yang
7abc452492 Bug 907585 [1/3]: B2G RIL - share RilMessageManager. Move to RilMessageManager.jsm. r=yoshi,hsinyi 2013-09-04 15:53:39 +08:00
Vicamo Yang
836b79ae07 Bug 864485 - 3/3: Gonk backend specific. r=hsinyi 2013-09-04 15:53:34 +08:00
Vicamo Yang
3caf63238c Bug 864485 - 2/3: DOM & IPC. r=khuey 2013-09-04 15:53:30 +08:00
Phil Ringnalda
8b4379a664 Back out ed63ede44a82:db85ebf7b0dc (bug 864485) for debug build bustage 2013-09-03 22:33:35 -07:00
Vicamo Yang
a8dc8ed91c Bug 864485 - 3/3: Gonk backend specific. r=hsinyi 2013-09-04 12:46:04 +08:00
Vicamo Yang
d2b683037b Bug 864485 - 2/3: DOM & IPC. r=khuey 2013-09-04 12:46:01 +08:00
Jessica Jong
9b006feee7 Bug 908603 - B2G RIL: Data connection not workable after flight mode on/off. r=vicamo 2013-08-29 09:58:41 -04:00
Boris Zbarsky
03d632d917 Bug 909645 part 2. Don't include ipdl headers in Hal.h. r=ms2ger 2013-08-28 00:14:57 -04:00
Brian O'Keefe
4f68eb9b02 Bug 875934 - Move LIBRARY_NAME to moz.build, batch 3; r=mshal 2013-08-15 09:02:09 -04:00
Shao Hang Kao
e39458f3a8 Bug 874771 - Implement SNTP support (Gecko end). r=gene 2013-06-22 22:22:05 +08:00
Boris Zbarsky
a6ce34f2cf Back out revisions 042d50591265:69f4af72765c (bug 909645) due to Windows bustage causing a CLOSED TREE. 2013-08-28 01:46:00 -04:00
Boris Zbarsky
d7e2aadfa7 Bug 909645 part 2. Don't include ipdl headers in Hal.h. r=ms2ger 2013-08-28 00:14:57 -04:00
Fabrice Desré
451d5f91ac Bug 864932 - Rewrite wifi workers in c++ r=mrbkap 2013-08-27 13:54:51 -07:00
Shawn Ku
fb86c837cf Bug 905479 - Part 4: Add test for change call barring password. r=yoshi, r=hsinyi 2013-08-27 10:03:11 +08:00
Shawn Ku
d295aba090 Bug 905479 - Part 3: RIL implementation on change call barring password. r=hsinyi, r=yoshi 2013-08-27 09:59:17 +08:00
Szu-Yu Chen [:aknow]
5a3a5018ab Bug 882983 - Part 3: Pass ota status (ril). r=hsinyi 2013-08-27 08:25:54 -04:00
Georgia Wang
d60b998b64 Bug 906948 - Avoid un-assigned rilMessageType checking on GetIMEI. r=yoshi 2013-08-23 18:49:00 +08:00
Edgar Chen
10355a0807 Bug 908135 - Remove dhcp attribute in nsINetworkInterface. r=vyang, vchang 2013-08-22 17:43:53 +08:00
Hsin-Yi Tsai
f98069ff92 Bug 905109 - Part 4: add getter for members in Buf. r=hsinyi 2013-08-23 23:45:51 +08:00
"allstars.chh"
6dee1fcaf6 Bug 905109 - Part 3: Update test_ril_code_quality.py. r=hsinyi 
From 880ccfcbb169ffc33e7e0d40bfbd95a26705b9f3 Mon Sep 17 00:00:00 2001
---
 dom/system/gonk/tests/marionette/test_ril_code_quality.py |    4 ++++
 1 file changed, 4 insertions(+)
 2013-08-15 14:59:34 +08:00
"allstars.chh"
dec626a587 Bug 905109 - Part 2: Update Makefile.in to add worker_buf.js r=gps 
From 7c0743554872f6466ee92071d3ce3c6a288351e4 Mon Sep 17 00:00:00 2001
---
 dom/system/gonk/Makefile.in |    8 ++++++++
 1 file changed, 8 insertions(+)
 2013-08-22 12:24:09 +08:00
"allstars.chh"
23522808da Bug 905109 - Part 1: Move Buf to worker_buf.js. r=bent, vicamo. 2013-08-22 12:17:40 +08:00
Hsin-Yi Tsai
e847d440e3 Bug 908636 - B2g RIL: return false in setCallingLineIdRestriction. r=vicamo 2013-08-23 20:42:20 +08:00
Marco Chen
cf9e0de65e Bug 904531 - AudioManager should actively ask settings DB for volume initialization. r=mwu 2013-08-23 11:29:11 +08:00
Ken Chang
7e455367fd Bug 901232 - B2G RIL: Data call not working on Nexus S, r=vyang 2013-08-06 16:43:45 +08:00
Dave Hylands
0ffd2e95b8 Bug 878310 - Improve DeviceStorage volume status reporting. r=qDot 
This changeset causes tranistory states when changing from mounted to shared,
and back to mounted to be reported as shared instead of unavailable.

We also don't send the same status twice in a row.
 2013-08-22 16:12:25 -07:00
Ed Morley
d384a21010 Merge mozilla-central and b2g-inbound 2013-08-22 12:05:51 +01:00
Jessica Jong
6b77647a47 Bug 832808 - B2G Multi-SIM: To support data call function for multi-SIM. r=vicamo 2013-08-22 18:06:36 +08:00
Ms2ger
ced3dd8b1c Bug 883284 - Part c: Move LIBXUL_LIBRARY into moz.build (d-e); r=mshal 2013-08-22 08:56:00 +02:00
Ms2ger
4d968c40e1 Bug 882859 - Part b: Move FAIL_ON_WARNINGS into moz.build; r=joey+gps 2013-08-22 08:55:59 +02:00
Hsin-Yi Tsai
798f39b5bf Bug 772765 - part3 - RIL impl. r=vicamo 2013-07-06 18:40:58 +08:00
Jessica Jong
a10653a2e5 Bug 905955 - B2G RIL: mms data connection does not get disconnected. r=vicamo 2013-08-20 19:31:10 +08:00
Hsin-Yi Tsai
00a6b0a728 Bug 905076 - [wasabi] Temporary CLIR not work on CDMA. r=vicamo 2013-08-16 16:18:31 +08:00
Georgia Wang
a3678d596d Bug 795252 - Part 4: Modify xpcshell STK tests. r=yoshi 2013-08-16 10:23:12 +08:00
Georgia Wang
88af2d8602 Bug 795252 - Part 2: Refactore StkProactiveCmdHelper. r=yoshi. 2013-08-16 09:59:55 +08:00
Georgia Wang
6407abb1ea Bug 795252 - Part 1: Refactore StkCommandParamsFactory. r=yoshi 2013-08-15 15:30:39 +08:00
Edgar Chen
02547c60f0 Bug 905503 - Add a new card state and xpcshell tests for personalization ready. r=allstars.chh 2013-08-15 12:04:23 +08:00
Ed Morley
6317bd519a Merge mozilla-central and b2g-inbound 2013-08-15 13:37:27 +01:00
Ed Morley
ac93237f7c Merge latest green b2g-inbound changeset and mozilla-central 2013-08-15 11:58:48 +01:00
Gregory Szorc
c089ae373d Bug 850380 - Derecursify and optimize XPIDL processing and move into precompile tier; r=glandium 2013-08-14 08:40:25 -07:00
Edgar Chen
98db692ae5 Bug 903257 - Part 1: Have a consistent information for signal and registration status. r=hsinyi 2013-08-09 12:27:19 +08:00
Carsten "Tomcat" Book
89b83199da merge mozilla-central to b2g-inbound 2013-08-14 15:02:24 +02:00
Carsten "Tomcat" Book
b753353c47 merge b2g-inbound to mozilla-central 2013-08-14 14:11:03 +02:00
Ms2ger
df8525f77d Bug 901323 - Don't include nsContentUtils.h unnecessarily; r=jlebar 2013-08-14 08:56:21 +02:00
Shawn Ku
71f79eb3b4 Bug 899400 - B2G RIL: Call Waiting MMI functionality. r=hsinyi 2013-08-14 16:16:04 +08:00
poojas
dee457191f Bug 898506 - (jb-gonk) Adapt to netd protocol changes for USB tethering. r=vchang 2013-08-14 08:51:07 -04:00
Szu-Yu Chen [:aknow]
fdbbaaf3c2 Bug 887690 - Part 4: Test emergency callback mode (xpcshell-test). r=hsinyi 2013-08-14 08:50:48 -04:00
Szu-Yu Chen [:aknow]
e05d7d1723 Bug 887690 - Part 3: Add emergency callback mode support (ril). r=hsinyi 2013-08-14 08:50:36 -04:00
Hsin-Yi Tsai
552bff3eff Bug 905090 - B2G RIL: undefined state in kScreenStateChangedTopic, RadioInterfaceLayer.js. r=vicamo 2013-08-14 18:11:47 +08:00
Szu-Yu Chen [:aknow]
be2bd91754 Bug 905007 - Fix test_ril_worker_buf.js. r=vicamo 2013-08-14 16:45:27 +08:00
Szu-Yu Chen [:aknow]
afbe8a7917 Bug 905050 - Fix test_ril_worker_mmi.js. r=vicamo 2013-08-14 16:45:22 +08:00
Marco Chen
941e349e7d Bug 895822 - To initilize AudioManager service in SystemWorkerManager for monitoring the headset change and setting configuration of audio backend. r=dhylands 2013-08-13 15:12:53 +08:00
Vicamo Yang
7f68089c03 Bug 899885 - 2/2: fix all communications to ril_worker. r=yoshi,gene 2013-08-13 20:14:13 +08:00
Vicamo Yang
6c2198d1fe Bug 899885 - 1/2: B2G RIL - Callback-based worker messaging. Add WorkerMessenger. r=yoshi 2013-08-13 20:14:10 +08:00
Vicamo Yang
be5bad0b65 Bug 904084 - fix voicemail test case test_voicemail_statuschanged.js permanent failure. r=yoshi 2013-08-14 10:23:58 +08:00
Hsin-Yi Tsai
be1fc07ae2 Bug 869769 - [B2G][CDMA] Set and Query the preferred voice - part4 - test. r=vicamo 2013-08-08 19:06:55 +08:00
Hsin-Yi Tsai
020f552fea Bug 869769 - [B2G][CDMA] Set and Query the preferred voice mode in CDMA. part3 - RIL. r=vicamo 2013-08-14 16:22:38 +08:00
Jessica Jong
52f5a2f03a Bug 899418 - B2G RIL: remove deprecated interface methods/attributes from nsIRadioInterface. r=vicamo 2013-08-13 11:29:02 +08:00
Ryan VanderMeulen
1f7ca11ce8 Backed out 4 changesets (bug 887690) for suspicion of causing frequent mochitest-2 failures. 
Backed out changeset 106ae6eee902 (bug 887690)
Backed out changeset e2c72cb029f4 (bug 887690)
Backed out changeset 9eea090ed6f7 (bug 887690)
Backed out changeset 1defeb691f5c (bug 887690)
 2013-08-12 19:13:38 -04:00
Szu-Yu Chen [:aknow]
7ef4690257 Bug 887690 - Part 4: Test emergency callback mode (xpcshell-test). r=hsinyi 2013-08-12 08:25:42 -04:00
Szu-Yu Chen [:aknow]
5162688469 Bug 887690 - Part 3: Add emergency callback mode support (ril). r=hsinyi 2013-08-12 08:25:24 -04:00
Szu-Yu Chen [:aknow]
3fdaa81a60 Bug 869776 - Part 2: Test cell broadcast config. r=vicamo 2013-08-12 08:22:31 -04:00
Szu-Yu Chen [:aknow]
146d053dae Bug 869776 - Part 1: Support cdma cell broadcast config. r=vicamo 2013-08-12 08:22:15 -04:00
Yoshi Huang
263c72cfe5 Bug 902769 - Part 2: xpcshell tests for facility lock. r=vicamo 2013-08-09 15:47:33 +08:00
Yoshi Huang
9a6fafe4b1 Bug 902769 - Part 1: Patch. r=vicamo 2013-08-08 17:04:07 +08:00
Yoshi Huang
ed495b93c3 Bug 895169 - B2G RIL: Check contact attributes values when export to SIM. r=vicamo 2013-08-09 16:00:38 +08:00
Edgar Chen
465a4666af Bug 902380 - Have a consistent operator information in ril_worker and RadioInterfaceLayer. r=hsinyi 2013-08-08 17:29:42 +08:00
Ryan VanderMeulen
8afe7e8fed Merge inbound to m-c. 2013-08-09 19:08:45 -04:00
Ryan VanderMeulen
4bdd6d2653 Merge m-c to b2g-inbound. 2013-08-08 16:24:53 -04:00
Szu-Yu Chen [:aknow]
1f8e109a85 Bug 905510 - Handle imported file not found. r=hsinyi 2013-08-15 08:25:56 -04:00
Carsten "Tomcat" Book
840821bdce merge mozilla-central to mozilla-inbound 2013-08-08 14:01:54 +02:00
Carsten "Tomcat" Book
2e9c4e6c35 merge b2g-inbound to mozilla-central 2013-08-08 13:33:12 +02:00
Gene Lian
5871ffc99b Bug 901887 - [RIL][Contacts] Saving to SIM doesn't work. r=allstars.chh 2013-08-08 16:16:50 +08:00
Yoshi Huang
6ae584a29b Bug 900321 - Part 3: const card lock types to fix style nits. r=vicamo 2013-08-07 12:15:39 +08:00
Yoshi Huang
cbdcc9f321 Bug 900321 - Part 2: Update RIL and test case. r=vicamo 2013-08-05 15:23:10 +08:00
Edgar Chen
20f6d35f2b Bug 900850 - Part 2: Xpcshell tests for accessing contacts of CDMA RUIM. r=allstars.chh 2013-08-06 12:00:52 +08:00
Edgar Chen
70dfe72747 Bug 900850 - Part 1: Support accessing contacts of CDMA RUIM. r=allstars.chh 2013-08-02 16:13:32 +08:00
Jose Antonio Olivera Ortega
3a52957dbb Bug 894871 - [User Story] [Suplementary Services] Temporary MMI codes: support calling line identification restriction (+CLIR). r=hsinyi 2013-08-08 00:47:34 +02:00
Nicholas Nethercote
25d70fdd97 Bug 902332 - Replace JS_{FALSE,TRUE} with {false,true} almost everywhere. r=luke,bz. 
--HG--
extra : rebase_source : 25f4de1bfae830b0af6407d260a70b787ab1dc9b
 2013-08-06 23:59:54 -07:00
Ryan VanderMeulen
f2638ccd28 Merge m-c to inbound. 2013-08-06 14:24:39 -04:00
Nicholas Nethercote
ba723f1034 Bug 901750 - Change return type of |JSNative| from |JSBool| to |bool|. code=nnethercote,jandem. r=luke,bz. 
--HG--
extra : rebase_source : 5b3d7cc339af6d93bde078322e25c6e740d1b617
 2013-08-02 00:41:57 -07:00
Ryan VanderMeulen
8e33abb5a7 Merge m-c to inbound. 2013-08-05 20:00:43 -04:00
Szu-Yu Chen [:aknow]
c185f2f507 Bug 743150 - Part 4: Test for supplementary service notification in RIL. r=hsinyi 2013-08-05 16:28:48 -04:00
Szu-Yu Chen [:aknow]
b215636d8a Bug 743150 - Part 3: Handle supplementary service notification in RIL. r=hsinyi 2013-08-05 16:28:31 -04:00
Carsten "Tomcat" Book
cda28b85ed Merge b2g-inbound to m-c 2013-08-05 11:22:48 +02:00
Szu-Yu Chen [:aknow]
17e5c6116c Bug 900900 - Fix test_ril_worker_clir.js. r=hsinyi 
---
 dom/system/gonk/tests/test_ril_worker_clir.js |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
 2013-08-05 14:00:28 +08:00
Ed Morley
a9606b2dba Merge latest green b2g-inbound changeset and mozilla-central 2013-08-02 13:30:22 +01:00
Vincent Chang
e1c76c4896 Bug 887485 - Wifi code needs to issue fwreload to netd as part of initialization. r=mrbkap 2013-07-30 16:07:13 +08:00
Edgar Chen
895c08a431 Bug 835237 - Part 1: Update signal strength for CDMA/EVDO network. r=hsinyi 2013-07-22 14:35:28 +08:00
Gene Lian
f4a32f10a3 Bug 850140 - B2G MMS: implement MmsService.handleDeliveryIndication() to handle delivery report (part 1, provide and correct DB functions). r=vicamo a=koi+ 2013-07-31 15:23:37 +08:00
Szu-Yu Chen [:aknow]
75fe33645c Bug 880643 - Part 2: Address the suggestion from jshint. r=hsinyi 
---
 dom/system/gonk/RILContentHelper.js    |    6 +++---
 dom/system/gonk/RadioInterfaceLayer.js |    2 +-
 dom/system/gonk/ril_worker.js          |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 2013-07-31 16:03:57 +08:00
Szu-Yu Chen [:aknow]
cc35f65185 Bug 880643 - Part 1: Add a test for coding style check on RIL code by JSHint. r=hsinyi 
---
 dom/system/gonk/tests/marionette/manifest.ini      |    1 +
 .../gonk/tests/marionette/ril_jshint/README.md     |    9 +
 .../gonk/tests/marionette/ril_jshint/jshint.js     |11096 ++++++++++++++++++++
 .../gonk/tests/marionette/ril_jshint/jshintrc      |  118 +
 .../gonk/tests/marionette/test_ril_code_quality.py |  353 +
 5 files changed, 11577 insertions(+)
 create mode 100644 dom/system/gonk/tests/marionette/ril_jshint/README.md
 create mode 100644 dom/system/gonk/tests/marionette/ril_jshint/jshint.js
 create mode 100644 dom/system/gonk/tests/marionette/ril_jshint/jshintrc
 create mode 100644 dom/system/gonk/tests/marionette/test_ril_code_quality.py
 2013-07-31 16:03:10 +08:00
Jose Antonio Olivera Ortega
1b06efb119 Bug 897869 - [b2g-ril] Need to keep CLIR settings across reboots. r=vicamo 2013-07-31 09:56:43 +02:00
Yoshi Huang
878dc67d36 Bug 895960 - Part 3: revise parseMccMncFromImsi. r=hsinyi 2013-07-30 17:34:00 +08:00
Yoshi Huang
dd802dcdd9 Bug 895960 - Part 2: Test cases for reading PBR. r=hsinyi 2013-07-30 17:33:00 +08:00
Yoshi Huang
9575de9cae Bug 895960 - Part 1: Patch. r=hsinyi 2013-07-23 14:34:30 +08:00
Michael Wu
1a8c333f02 Bug 899769 - Fix build of AudioManager.cpp when bluetooth is disabled, r=rlin 2013-07-30 22:44:48 -04:00
Ryan VanderMeulen
2ebd22d781 Merge m-c to inbound. 2013-07-30 18:08:18 -04:00
Ryan VanderMeulen
6526e75dbb Merge m-c to birch. 2013-07-30 13:11:10 -04:00
Ryan VanderMeulen
e3e2198ade Merge m-c to inbound on a CLOSED TREE. 2013-07-30 09:23:28 -04:00
Ryan VanderMeulen
51ceaf5fcb Backed out changesets bc5f5ce22ae3 and 3d682482e90c (bug 880643) for Marionette failures. 2013-07-30 08:52:19 -04:00
Edgar Chen
431a6df64d Bug 899484 - Part 1: Use sendChromeMessage to send message instead of using sendDOMMessage. r=hsinyi 2013-07-30 17:11:03 +08:00
Randy Lin
9dd2262890 Bug 842934 - [Bluetooth]A2DP sound disappear after SCO disconnected (call ended) and switching patch to A2DP. r=mchen 2013-07-30 14:58:58 +08:00
Szu-Yu Chen [:aknow]
4b1319ad77 Bug 880643 - Part 2: Address the suggestion from jshint. r=hsinyi 
---
 dom/system/gonk/RILContentHelper.js    |    6 +++---
 dom/system/gonk/RadioInterfaceLayer.js |    2 +-
 dom/system/gonk/ril_worker.js          |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 2013-07-30 17:21:34 +08:00
Szu-Yu Chen [:aknow]
01b61c816f Bug 880643 - Part 1: Add a test for coding style check on RIL code by JSHint. r=hsinyi 
---
 dom/system/gonk/tests/marionette/manifest.ini      |    1 +
 .../gonk/tests/marionette/ril_jshint/README.md     |    9 +
 .../gonk/tests/marionette/ril_jshint/jshint.js     |11096 ++++++++++++++++++++
 .../gonk/tests/marionette/ril_jshint/jshintrc      |  117 +
 .../gonk/tests/marionette/test_ril_code_quality.py |  353 +
 5 files changed, 11576 insertions(+)
 create mode 100644 dom/system/gonk/tests/marionette/ril_jshint/README.md
 create mode 100644 dom/system/gonk/tests/marionette/ril_jshint/jshint.js
 create mode 100644 dom/system/gonk/tests/marionette/ril_jshint/jshintrc
 create mode 100644 dom/system/gonk/tests/marionette/test_ril_code_quality.py
 2013-07-30 17:18:44 +08:00
Bobby Holley
c00f6379ec Bug 899245 - Rename JS_GetGlobalForScopeChain to JS::CurrentGlobalOrNull. r=luke 
This was done with perl/grep.
 2013-07-29 16:45:27 -07:00
Dave Hylands
26afd0413c Bug 898634 - Add some logging for volumes created via volume.cfg. r=jwwang 2013-07-29 16:41:07 -07:00
Fernando Jiménez
85874f9c69 Bug 816564 - Silent SMS to Authenticate Device for Mobile Billing. Part 1: RIL. sr=vicamo 2013-07-30 00:50:22 +02:00
Ryan VanderMeulen
05ac7b8b7c Merge m-c to birch. 2013-07-29 16:07:59 -04:00
Jose Antonio Olivera Ortega
c7a6b08844 Bug 833754 - Part 2: Changes in tests for call barring through MMI codes. r=ferjm 2013-07-29 20:17:33 +02:00
Jose Antonio Olivera Ortega
e2d1b61f96 Bug 833754 - Part 1: RIL changes for call barring through MMI codes. r=ferjm 2013-07-29 20:17:29 +02:00
Hsin-Yi Tsai
7b256d7c85 Bug 899028 - [B2G] [CDMA] reject an incoming call. r=vicamo 2013-07-29 18:47:24 +08:00
Ed Morley
c02ed6a62f Merge mozilla-central and inbound 2013-07-29 15:42:41 +01:00
Jon Coppeard
8278efd42a Bug 897484 - GC: Convert JS_GetProperty APIs to take MutableHandleValue r=terrence r=bholley r=smaug 2013-07-26 10:00:38 +01:00
Michael Wu
a8827750da Bug 898812 - Add support for JB MR2's dhcp_do_request, r=vchang 2013-07-28 00:39:03 -04:00
Carsten "Tomcat" Book
f6ddd08c1c Merge mozilla-central to mozilla-inbound 2013-08-05 11:59:14 +02:00
Vincent Chang
90c9f44100 Bug 884131 - Messages to netd need sequence number on gonk-JB. r=dhylands 2013-08-05 12:16:14 +08:00
Ehsan Akhgari
9854ac6166 Bug 872127 - Part 2: Replace mozilla/StandardInteger.h with stdint.h; r=Waldo,ted 2013-07-30 10:25:31 -04:00
Joey Armstrong
9bdf289b5e Bug 870370 - Move EXTRA_COMPONENTS to mozbuild (file batch #3); r=mshal 2013-06-11 16:38:22 -04:00
Edgar Chen
7149cfbdb1 Bug 869768 - Part 3: RIL implementation for roaming preference. r=hsinyi 2013-06-10 15:47:03 +08:00
Carsten "Tomcat" Book
8c89deb65b Backed out changeset ae8d72538dee (bug 897484) for b2g bustage 2013-07-26 12:34:25 +02:00
Jon Coppeard
fc9b509d4f Bug 897484 - GC: Convert JS_GetProperty APIs to take MutableHandleValue r=terrence r=bholley r=smaug 2013-07-26 10:00:38 +01:00
Alexandre Lissy
76972f1519 Bug 894281 - Process emergency call once network is really available. r=vicamo 2013-07-24 15:06:45 +02:00
Edgar Chen
aa5a7a80dc Bug 882984 - Part 4: Fix xpcshell tests. r=hsinyi 
--HG--
extra : rebase_source : 40890b4ac9b3cc242b7ab98ff338c67859cb9447
 2013-07-04 12:31:14 +08:00
Edgar Chen
29ec32ccf1 Bug 882984 - Part 3: GPS changes for MobileCellInfo. r=kchen 
--HG--
extra : rebase_source : ceaedcb70d3a8a4f936faec8a62c57d31b30853b
 2013-07-18 17:30:54 +08:00
Edgar Chen
9f6582ed7f Bug 882984 - Part 2: RIL implementation for exposing CDMA registration information. r=hsinyi 
--HG--
extra : rebase_source : 63fd4e832c00117853b7cb4781d7923763b4f3eb
 2013-07-04 11:48:48 +08:00
Ryan VanderMeulen
42e6c4c435 Merge m-c to inbound on a CLOSED TREE. 2013-07-23 16:14:26 -04:00
Viral Wang
56d3b5dab7 Bug 890144 - Add function InitVolumeConfig to add volume by configuration file in AutoMounter. r=dhylands 2013-07-23 08:30:35 -04:00
Jessica Jong
a14f49bd61 Bug 761732 - B2G RIL: rename {handle|send}DOMMessage in ril_worker.js. r=vyang 2013-07-23 16:29:55 +08:00
Shawn Ku
9a6e1585d6 Bug 891242 - [MMI] Short Code MMI (length<3) does not work as expected - Gecko part, r=HsinYi 2013-07-23 15:02:37 +08:00
Vincent Chang
3e334827f0 Bug 896413 - dnsmasq is not deleted when wifi hotspot is turned off. r=mrbkap 2013-07-23 13:19:26 +08:00
Vincent Chang
e0353921c7 Bug 896352 - JavaScript Warning: "reference to undefined property params.interfaceList". r=mrbkap 2013-07-22 19:49:24 +08:00
Ed Morley
ad18c49f61 Merge mozilla-central and birch 2013-07-22 16:52:40 +01:00
Ed Morley
80f7935e32 Merge latest green birch changeset and mozilla-central 2013-07-22 16:18:53 +01:00
Jose Antonio Olivera Ortega
79653e026d Bug 892498 - [User Story] [Suplementary Services] Permanent MMI codes: support calling line identification restriction (+CLIR). r=ferjm 2013-07-22 12:01:03 +02:00
Gene Lian
f505ac7864 Bug 891756 - [sms][mms] Gecko needs to return proper error code to notify Gaia the address is invalid (part 1, "InvalidAddressError"). r=vicamo a=leo+ 2013-07-11 11:23:49 +08:00
Edgar Chen
2d536f46e6 Bug 866619 - Part 1: Wrong state mapping for NETWORK_CREG_STATE_SEARCHING. r=allstars.chh 2013-07-19 12:00:41 +08:00
Ken Chang
1774752763 Bug 886765 - Make sure that no other application will send traffic when we send/receive a MMS and data traffic is off. r=vicamo 2013-07-12 13:01:37 +08:00
Thomas Zimmermann
9f9c8e0560 Bug 894884: Use ro.moz.ril.query_icc_count property, r=vyang 
Our original property name ro.moz.ril.have_query_icc_lock_retry_count
is longer than the maximum of 32 characters and gets filtered out by
Android at runtime. This patch introduces a shorter property name
instead.
 2013-07-19 08:59:19 +02:00
Thomas Zimmermann
1771da0692 Bug 886239: Remove retryCount from nsIDOMMobileConnection, r=vyang 
The attribute retryCount is deprecated and removed by this
patch. When it lands, all users of retryCount have been
converted to getCardLockRetryCount.
 2013-07-19 08:48:04 +02:00
Ryan VanderMeulen
c388bb45e1 Merge m-c to birch. 2013-07-18 20:36:44 -04:00
Michael Henretty
5406284265 Bug 890909 - [Contacts API] migration code problem when matching using the substringMatching pref (eg in Brazil). r=gwagner 2013-07-18 16:17:41 -04:00
Ryan VanderMeulen
0439786998 Merge m-c to inbound on a CLOSED TREE. 2013-07-18 14:53:05 -04:00
Marco Chen
54556f3ccf Bug 876334 - Remove GB support from AudioManager. r=mwu 2013-07-18 13:23:10 +08:00
Marco Chen
0450dbca57 Bug 876334 - Gecko should use AudioChannelType to control volume not stream types. r=mwu, r=baku 2013-07-18 13:22:36 +08:00
Marco Chen
38954023a6 Bug 876334 - Remove temporary solution from BT for forcing output. r=mwu 2013-07-18 10:21:24 +08:00
Marco Chen
68d75198e5 Bug 876334 - Remove master/FM volume control from nsIAudioManager. r=mwu 2013-07-18 10:21:24 +08:00
Vicamo Yang
169a9317dd Bug 887745 - B2G SMS: more entries in GSM_SMS_STRICT_7BIT_CHARMAP. r=gene 2013-07-18 18:15:32 +08:00
Jose Antonio Olivera Ortega
ef28d5c58c Bug 888904 - Part 4: Test for CLIR. r=vicamo 2013-07-17 23:18:33 +02:00
Jose Antonio Olivera Ortega
a6d558c32c Bug 888904 - Part 3: RIL changes for CLIR support. r=vicamo 2013-07-17 23:18:29 +02:00
Jose Antonio Olivera Ortega
e14bf6b18d Bug 893727 - Part 2: Test for CLIP. r=ferjm 2013-07-17 17:28:34 +02:00
Jose Antonio Olivera Ortega
7f2836f9cf Bug 893727 - Part 1: RIL changes for CLIP support. r=ferjm 2013-07-17 17:28:30 +02:00
Thomas Zimmermann
5c437a9277 Bug 868896: Use REQUEST_GET_UNLOCK_RETRY_COUNT on emulator, r=vyang 
With this patch, Gecko sends REQUEST_GET_UNLOCK_RETRY_COUNT to rild
when the retry counter for a lock is being queried on the emulator.

On devices other than the emulator the function returns the error code
REQUEST_NOT_SUPPORTED, which is precisely the behavior we currently
implement.
 2013-07-17 15:19:36 +02:00
Marco Chen
34538438fb Bug 889730 - Switch states of Headphone are not only On/Off but Headset/Headphone. r=baku 2013-07-17 14:21:00 +08:00
Randy Lin
2c8d191d24 Bug 860584 - [Buri][ACC] Speaker sound when plug out earphone. r=mchen 2013-07-17 13:08:11 +08:00
Dave Hylands
527b9ef47f Bug 876782 - Automounter shouldn't unmount so agressively. r=qdot 2013-07-16 13:14:09 -07:00
Edgar Chen
d8f10a7fb2 Bug 893791 - Fix xpcshell tests failed in test_ril_worker_mmi.js. r=vyang 2013-07-15 23:04:22 +08:00
Edgar Chen
cecf608ccb Bug 866645 - Part 2: Xpcshell tests for the utility function of mcc/mnc parsing. r=allstars.chh 2013-07-16 11:51:44 +08:00
Edgar Chen
ef9ffc7f24 Bug 866645 - Part 1: Get the mcc/mnc of CDMA RUIM. r=allstars.chh 2013-07-15 17:22:54 +08:00
Ryan VanderMeulen
940ea7bfd9 Backed out changeset 129a238dbe1f (bug 889730) for B2G debug bustage. 2013-07-16 11:56:00 -04:00
Marco Chen
39359ecf3a Bug 889730 - Switch states of Headphone are not only On/Off but Headset/Headphone. r=baku 2013-07-16 16:30:41 +08:00
Szu-Yu Chen [:aknow]
6d69679bd6 Bug 881142 - Part 4: Remove call state busy (RIL). r=hsinyi 2013-07-15 08:54:22 -04:00
Ryan VanderMeulen
2cca46b24a Merge m-c to birch. 2013-07-12 13:31:17 -04:00
Ryan VanderMeulen
48411f99e3 Merge m-c to inbound. 2013-07-12 09:29:59 -04:00
Fernando Jiménez
d48833635c Bug 883048 - [MMI] Send a ussd code while in airplane mode is allowed and doesn´t show any notification. r=vicamo 2013-07-12 10:42:17 +02:00
Hubert Figuiere
4d2390531a Bug 891497 - Fix typo in debug message. r=vyang 2013-07-10 12:19:00 -04:00
JW Wang
6f3a9694c5 Bug 865347 - Add a test case to test new functions. r=dhylands 2013-07-04 14:47:26 +08:00
JW Wang
18bc5860c7 Bug 865347 - Add functions to manipulate fake volumes to test SD card insert/remove. r=dhylands 2013-07-09 14:37:47 +08:00
Ryan VanderMeulen
327c24c216 Backed out changesets d76274933db8 and dd3cedcdbe2b (bug 865347) to see if it fixes the Marionette timeouts. 2013-07-09 14:21:02 -04:00
Thomas Zimmermann
f2d4199d6b Bug 875710: Added getCardLockRetryCount to nsIIccProvider, r=vyang, sr=mounir 
This patch adds getCardLockRetryCount to nsIIccProvider and its
implementations. This method allows callers to query the number
of remaining tries for unlocking a SIM-card lock. Supported locks
are 'pin', 'puk', 'pin2', 'puk2', 'nck', 'cck', and 'spck'. The
call returns a DOM request that returns the retry count in its
success handler, or signals an appropriate error.

Reading the retry count is an optional feature and may not be
supported for all lock types. In this case the DOM request receives
and error with the name GECKO_ERROR_NOT_SUPPORTED. For an invalid
lock type, the error name is GECKO_ERROR_GENERIC_FAILURE.

getCardLockRetryCount replaces retryCount in nsIDOMMobileConnection,
which is now deprecated.

--HG--
extra : rebase_source : d1d11612f836652dca85f7c701f09e7af962e3b7
 2013-07-09 16:06:05 +02:00
JW Wang
2dfca4b51c Bug 865347 - Add a test case to test new functions. r=dhylands 2013-07-04 14:47:26 +08:00
JW Wang
f4a05c166b Bug 865347 - Add functions to manipulate fake volumes to test SD card insert/remove. r=dhylands 2013-07-09 14:37:47 +08:00
Justin Lebar
5b159515e1 Bug 889984 - Don't leak objects which "inherit" from DOMRequestIpcHelper the associated window is closed. r=fabrice 2013-07-08 17:55:42 -04:00
Vasanthakumar Pandurangan
197d3def79 Bug 892876 - (gonk-jb) Update AUDIO IN/OUT enums. r=mwu 2013-07-19 21:04:23 -07:00
Vincent Chang
ac14c6f23a Bug 787442 - Turn on wifi/usb tethering simultaneously. r=mrbkap 2013-06-19 18:57:58 +08:00
Joshua Cranmer
fb0ab49c35 Bug 884061 - Part 3f: Use NS_DECL_THREADSAFE_ISUPPORTS in dom/, r=smaug,dhylands. 
--HG--
extra : rebase_source : b8eaae07c54c94c8c46c7ed4c0e226eb74584652
 2013-07-18 21:21:20 -05:00
Trevor Saunders
82e5558b37 bug 887483 - remove a bunch of useless assignments to FORCE_STATIC_LIB implied by LIBXUL_LIBRARY=1 r=mshal 2013-07-11 11:06:34 -04:00
Edgar Chen
6ec6f25d9d Bug 875721 - Part 5: RIL implementation changes for iccInfo. r=allstars.chh 2013-05-30 19:14:39 +08:00
Edgar Chen
31a9f418d6 Bug 875721 - Part 3: GPS changes for iccInfo. r=kchen 2013-05-30 18:52:56 +08:00
Edgar Chen
e482150a75 Bug 875721 - Part 1: Move iccInfo related attribute/event from mozMobileConnection to mozIccManager (IDL). r=allstars.chh, sr=sicking 2013-05-30 18:04:48 +08:00
Ken Chang
a213784c83 Bug 837488 - B2G RIL: Using array for data call settings and handling multiple sharing on one APN connection. r=hsinyi 2013-07-12 12:44:22 +08:00
Edgar Chen
7c073ef0d8 Bug 874744 - Part 3: Send cardstatechange event to iccManager. r=allstars.chh 2013-05-22 17:32:18 +08:00
Ryan VanderMeulen
7500c901d1 Bug 884134 - Fix ifdef to un-break B2G mochitest-3. 2013-07-03 16:38:28 -04:00
Michael Wu
5a9750ee88 Bug 884134 - Messages to vold need sequence number in gonk-JB, r=dhylands 2013-07-03 12:37:39 -04:00
Dimi Lee
c62bf17f06 Bug 888828 - Default route of 3G data call disappeared (after receiving disconnected event from wlan0). r=vchang 2013-07-02 11:50:50 +08:00
Chuck Lee
1874bb0a1b Bug 883754 - Throw an error on unexpected GSM SMS DCS value. r=vicamo 2013-07-01 11:16:44 +08:00
Vicamo Yang
7b018201e9 Bug 814581 - Part 8/8: fix debug messages as well. r=hsinyi,yoshi 2013-07-02 17:36:58 +08:00
Vicamo Yang
15cc9183c7 Bug 814581 - Part 7/8: fix test cases. r=yoshi 2013-07-02 17:36:55 +08:00
Vicamo Yang
41483888fb Bug 814581 - Part 6/8: fix NetworkManager. r=yoshi 2013-07-02 17:36:51 +08:00
Vicamo Yang
9a2b6740ef Bug 814581 - Part 5/8: fix MobileMessage. r=gene 2013-07-02 17:36:47 +08:00
Vicamo Yang
8288a7ef0f Bug 814581 - Part 4/8: fix GonkGPSGeolocationProvider. r=kanru 2013-07-02 17:36:44 +08:00
Vicamo Yang
ae711005e5 Bug 814581 - Part 3/8: dispatch RIL messages. r=hsinyi,yoshi 2013-07-02 17:36:40 +08:00
Vicamo Yang
127ae3d359 Bug 814581 - Part 2/8: create multiple intances of RadioInterface. r=hsinyi,yoshi 2013-07-02 17:36:37 +08:00
Vicamo Yang
4c6addfeee Bug 814581 - Part 1/8: MultiSIM - interface changes. sr=hsinyi 2013-07-02 17:36:33 +08:00
Szu-Yu Chen [:aknow]
f0a970db9f Bug 889215 - Fix xpcshell-test test_ril_worker_mmi.js. r=yoshi. 
---
 dom/system/gonk/tests/test_ril_worker_mmi.js |   47 +++++++++++++-------------
 1 file changed, 23 insertions(+), 24 deletions(-)
 2013-07-02 16:19:56 +08:00
Szu-Yu Chen [:aknow]
a5164734d9 Bug 885688 - Fix javascript warning in ril_worker.js. r=yoshi. 
---
 dom/system/gonk/ril_worker.js |   38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)
 2013-07-02 11:58:20 +08:00
Jose Antonio Olivera Ortega
c92350e6ef Bug 879680 - (mmi-result-cf) [MMI] Use MMIResult for Call Forwarding related functionality. r=ferjm 2013-07-01 01:23:52 +08:00
Fernando Jiménez
6a7538e891 Bug 874000 - (mmi-result-pin) [MMI] Use MMIResult for PIN/PIN2/PUK related functionality. r=vicamo 2013-07-01 01:01:02 +08:00
Fernando Jiménez
88023a7889 Bug 883178 - [MMI] Implement DOMMMIResult and DOMMMIError. Part 2: DOMMMIResult and DOMMMIError. r=vicamo, sr=sicking 2013-06-30 20:21:32 +08:00
Ken Chang
3dc84b5d2f Bug 884829 - follow up - fix typo. r=hsinyi 2013-06-28 13:08:52 +08:00