"allstars.chh"
ba5cb50774
Bug 928782 - B2G RIL: 'Import SIM Contact failed' after when Contact is WebIDLized. r=vicamo
2013-10-22 14:57:44 +08:00
Ed Morley
1c00b1ecce
Backed out changeset a8ee7948d5cf (bug 920551)
2013-10-25 10:52:20 +01:00
Ed Morley
cbfb3cbcec
Backed out changeset 7e0b33c685c8 (bug 920551)
2013-10-25 10:52:14 +01:00
Edgar Chen
d0f70c9d47
Bug 925676 - Part 2: RIL implementation. r=vyang,gene
2013-10-22 18:43:03 +08:00
Edgar Chen
0f26660bf0
Bug 925676- Part 1: IDL changes. r=vyang,gene
2013-10-22 17:30:35 +08:00
Vicamo Yang
d9f9ec6aab
Bug 920551 - 2.j/2: fix GonkGPSGeolocationProvider. r=kanru
2013-10-25 11:07:52 +08:00
Vicamo Yang
3dc0e9eff0
Bug 920551 - 2.h/2: fix dom/system/gonk/*. r=hsinyi,khuey
2013-10-25 11:07:44 +08:00
Vicamo Yang
b2e1f24146
Bug 926302 - 3/3: test cases. r=hsinyi
2013-10-24 16:15:15 +08:00
Vicamo Yang
7424816c3c
Bug 926302 - 2.b/3: implementation. r=gene,hsinyi,khuey
2013-10-24 16:15:06 +08:00
Vicamo Yang
d1519aebc4
Bug 926302 - 2.a/3: refactor preference/settings names. r=gene
2013-10-24 16:14:59 +08:00
Mike Hommey
59a17d0f20
Bug 921492 - Make StrictOrderingOnAppendList use actual alphabetical sorting. r=mshal,r=gps
2013-10-24 08:05:43 +09:00
Mike Hommey
3fa7456cd6
Bug 913268 - Make CPP_SOURCES a StrictOrderingOnAppendList. r=mshal
2013-10-24 08:00:23 +09:00
Trevor Saunders
f1399b6633
[PATCH] bug 922566 - kill dom-config.mk
...
From 6681eaa8bb47ddb4756fd71738771c4c437101c0 Mon Sep 17 00:00:00 2001
---
content/media/webspeech/recognition/Makefile.in | 1 -
content/media/webspeech/recognition/moz.build | 5 +-
content/media/webspeech/synth/Makefile.in | 1 -
content/media/webspeech/synth/pico/Makefile.in | 3 --
dom/alarm/Makefile.in | 2 -
dom/apps/src/Makefile.in | 1 -
dom/base/Makefile.in | 2 -
dom/base/moz.build | 26 ++++++++++-
dom/battery/Makefile.in | 1 -
dom/bindings/Makefile.in | 3 --
dom/bindings/moz.build | 17 ++++++-
dom/bindings/test/Makefile.in | 5 +-
dom/bluetooth/Makefile.in | 2 -
dom/bluetooth/moz.build | 7 ++-
dom/browser-element/Makefile.in | 3 --
dom/browser-element/moz.build | 6 ++-
dom/camera/Makefile.in | 1 -
dom/camera/moz.build | 5 +-
dom/devicestorage/Makefile.in | 1 -
dom/dom-config.mk | 61 -------------------------
dom/encoding/Makefile.in | 1 -
dom/fmradio/Makefile.in | 2 -
dom/fmradio/ipc/Makefile.in | 1 -
dom/fmradio/ipc/moz.build | 5 +-
dom/fmradio/moz.build | 5 +-
dom/icc/src/Makefile.in | 4 --
dom/media/Makefile.in | 3 --
dom/media/moz.build | 6 ++-
dom/mobilemessage/src/Makefile.in | 1 -
dom/mobilemessage/src/moz.build | 5 +-
dom/network/src/Makefile.in | 2 -
dom/plugins/base/Makefile.in | 1 -
dom/plugins/base/moz.build | 8 +++-
dom/power/Makefile.in | 1 -
dom/quota/Makefile.in | 1 -
dom/system/gonk/Makefile.in | 2 -
dom/telephony/Makefile.in | 1 -
dom/time/Makefile.in | 1 -
dom/wifi/Makefile.in | 5 --
39 files changed, 85 insertions(+), 123 deletions(-)
delete mode 100644 dom/dom-config.mk
delete mode 100644 dom/wifi/Makefile.in
2013-10-23 17:20:55 -04:00
Birunthan Mohanathas
4360fad5a0
Bug 784739 - Switch from NULL to nullptr in dom/ (2/2); r=ehsan
2013-10-28 10:04:47 -04:00
Dave Hylands
eaa0fd5266
Backout e7a4fe2d9e5e (Bug 818353) due to causing bug 929815.
2013-10-22 21:12:04 -07:00
Wes Kocher
3d55f8e6de
Merge m-c to inbound
2013-10-22 18:43:11 -04:00
Georgia Wang
ca5c3a0de9
Bug 908083 - Part3: browser termination envelop event xpcshell test. r=yoshi
2013-09-04 11:34:45 +08:00
Georgia Wang
02e1a2f491
Bug 908083 - Part2:"browser termination event" Envelope command implement. r=yoshi
2013-09-03 17:50:18 +08:00
Dave Hylands
f599a8dad8
Bug 928558 - AutoMounter mark volumes as shared a bit early when open files are detected. r=qDot
2013-10-18 20:21:52 -07:00
Ryan VanderMeulen
956845a7af
Merge inbound to m-c.
2013-10-18 15:08:39 -04:00
Carsten "Tomcat" Book
f1d2ae53bc
Merge mozilla-central to mozilla-inbound
2013-10-18 14:13:10 +02:00
Reuben Morais
f6d165b4ea
Bug 850430 - Convert the Contacts API to WebIDL. r=bz r=gwagner
...
--HG--
extra : rebase_source : 9d7a645c0d2fb102d5d498fefebeb817a186720e
2013-10-17 18:29:56 -03:00
Edgar Chen
e21eba7b94
Bug 912902 - MMS/SMS: retrieve GSM MSISDN / CDMA MDN correctly. r=gene
2013-10-15 10:42:49 +08:00
Dave Hylands
6a016e9163
Bug 927961 - Add ums.status so that settings app can determine if files are open. r=gwagner
2013-10-17 15:41:46 -07:00
Shao Hang Kao
8d820872ed
Bug 926777 - B2G system time: |time.timezone| should save the UTC value with the correct sign. r=gene
2013-10-15 16:43:53 +08:00
Shawn Ku
9809f34556
Bug 925618 - Part 2: Add test case for moving reading MBDN/MSISDN into readSST(). r=yoshi
2013-10-16 17:45:17 +08:00
Shawn Ku
2524eb14d2
Bug 925618 - Part 1: RIL implementation on moving MBDN/MSISDN reading to the callback of readSST(). r=yoshi
2013-10-16 13:21:29 +08:00
Edgar Chen
0302b1b382
Bug 926358 - Fix the potential issue in MMI request handler. r=allstars.chh
2013-10-14 18:47:55 +08:00
Jessica Jong
d03df0638f
Bug 818353 - Part 5: RIL implementation. f=edgar r=hsinyi
2013-10-18 15:01:03 +08:00
Nathan Froyd
4398253a6f
Bug 928916 - use services::GetObserverService more in dom/; r=smaug
2013-10-21 08:58:12 -04:00
Marco Chen
1184f97f49
Bug 924787 - [AudioManager] The checking condition should be "leave here if settings name is not for bt_sco". r=mwu
2013-10-14 18:27:13 +08:00
Marco Chen
d0b7711dd9
Bug 923173 - Use NS_WARNING for unexpected name to avoid crashing. r=ehsan
2013-10-14 18:45:35 +08:00
Chuck Lee
8a137b22ca
Bug 789217 - 0003. Bring up keystore. r=khuey
2013-10-01 12:09:57 +08:00
Thomas Zimmermann
de61e57b99
Bug 925672: Update manifest.ini, r=jgriffin
...
Make sure Marionette knows about the test for REQUEST_SCREEN_STATE.
2013-10-14 10:22:20 +02:00
Edgar Chen
450ea14417
Bug 873380 - Part 3: RIL changes for icc card lock error. r=allstars.chh
2013-09-25 16:14:23 +08:00
Thomas Zimmermann
7dcc0d400b
Bug 905107: Added test case for screen-state handling in RIL, r=vicamo
...
The new test checks for the correctness of RIL's support of
'screen-state-change' events. The expected result is to set
CREG state to 1 when the screen is turned off, and back to
2 when the screen is turned on again.
2013-10-08 16:51:06 +02:00
Thomas Zimmermann
b4018d823c
Bug 905107: Fix options in RIL.setScreenState, r=vicamo
...
The method RIL.setScreenState parses its arguments incorrectly. The
RIL worker methods usually receive an object that contain their
arguments, but setScreenState expects a boolean. Because objects are
interpreted as 'true', setScreenState always signals enabled screen
state to the RIL daemon.
This patch changes RIL.setScreenState to expect an object as its
argument and read the screen state from the object.
2013-10-08 16:43:07 +02:00
Ryan VanderMeulen
c430ecd99d
Merge m-c to inbound.
...
CLOSED TREE
2013-10-09 15:34:02 -04:00
Ethan Tseng
4fea9ce938
Bug 920361 - Add error handle in NetworkManager.js::resetRoutingTable. r=vchang
2013-10-01 14:17:55 +08:00
Hsin-Yi Tsai
8373c47857
Bug 842239 - B2G Multi-SIM: get the number of RadioInterfaces. r=vicamo
2013-10-02 11:13:56 +08:00
Hsin-Yi Tsai
4cef5f3f3b
Bug 917922 - temporary CLIR mode not working. r=ferjm
2013-10-02 13:45:23 +08:00
Ryan VanderMeulen
f57f378fe7
Merge m-c to b2g-inbound.
2013-10-01 16:47:09 -04:00
Ehsan Akhgari
0e7c9d39cd
Bug 920292 - Part 1: Stop passing string literals as the first argument to MOZ_ASSERT; r=Waldo
2013-10-01 08:25:08 -04:00
Hsin-Yi Tsai
b5e10fc109
Bug 921422 - B2G RIL: include clientId in async messages from RadioInterface to RILContentHelper. r=vicamo
2013-09-30 08:56:00 +08:00
Henry Chang
3ee9df7165
Bug 900847 - Add and implement nsINetworkManager::setDhcpServer. r=vchang
2013-10-01 12:14:20 +08:00
Ethan Tseng
7e55df38e5
Bug 915529 - Add null pointer checking in stringToIP() of systemlibs.js. r=vchang
2013-09-30 16:31:12 +08:00
Vicamo Yang
31b177dcb2
Bug 919982: B2G RIL - read Gonk property "ro.moz.ril.numclients" instead. r=hsinyi
2013-09-30 17:24:54 +08:00
Nathan Froyd
e8316ed759
Bug 914826 - part 4 - fix source files that were bootlegging XPCOM do_* functions via generated ipdl headers; r=ehsan
2013-09-10 16:56:05 -04:00
Yoshi Huang
88453a9acd
Bug 920391 - B2G RIL: Buf.read/writeUint32 should be of signed int32 operation. r=vicamo
2013-09-26 14:53:50 +08:00
Georgia Wang
514b3633dc
Bug 916000 - Part2: Add sim state xpcshell test case. r=yoshi
2013-09-25 12:22:18 +08:00
Georgia Wang
abd0c8cd26
Bug 916000 - Part1: Add illegal sim state support in ril. r=yoshi
2013-09-25 12:20:03 +08:00
Masayuki Nakano
015140fe0d
Bug 912956 part.15 mozilla/TextEvents.h should be included directly r=roc
2013-09-25 20:21:19 +09:00
Ehsan Akhgari
8c43a4f37f
Bug 919505 - Minimize the #includes in dom/ipc; r=jst
2013-09-23 17:30:40 -04:00
Ehsan Akhgari
7233ba7103
Bug 918923 - Part 2: Switch to #including nsString.h in code using the internal strings API; r=bsmedberg
2013-09-23 13:25:00 -04:00
Jessica Jong
742484ce05
Bug 909688: B2G RIL - handle data connection state changes properly. r=vicamo
2013-09-18 18:07:14 +08:00
Hsin-Yi Tsai
97f256f2ed
Bug 915638 - part1 - B2G RIL: telephonyCallGroup.onstatechange isn't fired when a conference call is becoming empty. r=vicamo
2013-09-12 21:00:18 +08:00
Ethan Tseng
9ea9589875
Bug 855951 - Collect and save TX/RX traffic amounts of TCP connections per-App, r=gene, mcmanus
2013-08-29 14:15:08 +08:00
Georgia Wang
c0120064cb
Bug 908075 - Part2: USER_ACTIVITY stk event xpcshell test. r=yoshi
2013-09-04 18:52:28 +08:00
Georgia Wang
081eaa7392
Bug 908075 - Part1: "USER_ACTIVITY" event implement in RIL. r=yoshi
2013-09-04 18:45:35 +08:00
"allstars.chh"
beeab71058
Bug 915987 - Part 2: Update recordId for USIM contact. r=vicamo
2013-09-13 00:07:14 +02:00
"allstars.chh"
d988496c27
Bug 915987 - Part 1: reuse nsIDOMContact.id. r=vicamo
2013-09-12 23:52:07 +02:00
"allstars.chh"
843be820c6
Bug 915986 - Part 1: Check pin2 in RIL. r=vicamo
2013-09-12 18:04:35 +02:00
Marco Chen
35dca67442
Bug 823273 - Part 4: Music volume should be faded when notification sound is on going - FM Radio, Camera, Phone clients. r=rlin
2013-09-02 17:45:44 +08:00
Vicamo Yang
7dfae30e4d
Bug 912442 - Part 5 : fix test_ril_worker_sms.js. r=allstarts.chh
2013-09-14 00:12:30 +02:00
Vicamo Yang
9ebbb393b9
Bug 912442 - Part 4: move buf specific contants into Buf itself. r=allstars.chh
2013-09-14 00:12:25 +02:00
Edgar Chen
5da02488b2
Bug 912442 - Part 3: Remove m prefix from worker_buf.js and fix the tests. r=allstars.chh
2013-09-06 17:03:51 +08:00
Edgar Chen
fb150af9d5
Bug 912442 - Part 1: Fix header_helper.js. r=vicamo
2013-09-06 14:18:56 +08:00
Steven Lee
b1411c0617
Bug 904025 - part2: stop MediaStream when there is incoming call. r=jesup
2013-09-13 16:51:48 +08:00
Ryan VanderMeulen
fd143fc064
Merge m-c to b2g-inbound.
2013-09-12 20:41:54 -04:00
Marco Chen
8c960434be
Bug 855655 - [AudioChannelManager] Add New Attribute for Setting Default Control Volume Channel. r=baku
2013-09-12 20:26:03 +08:00
Szu-Yu Chen [:aknow]
57e5762882
Bug 909638 - Part 2: Remove token in callError/dataCallError message. r=vicamo
2013-09-12 15:16:36 +08:00
Chuck Lee
75da4fb1b8
Bug 882985 - 0002. Test case for CDMA information record decoder. r=vicamo
2013-09-09 23:19:51 +08:00
Chuck Lee
af3c11d608
Bug 882985 - 0001. Receive CDMA information record and send system message. r=vicamo
2013-09-11 00:48:19 +08:00
Dimi Lee
5cd52fe159
Bug 870704 - [Buri][Shira-49020] There is no option to configure a proxy for WiFi connections. r=vchang, sr=mrbkap
2013-08-22 18:22:25 +08:00
Gene Lian
f9511b385b
Bug 913777 - [Buri][SMS]When receive an SMS during handset locked,there is no notification. r=vicamo a=leo+
2013-09-10 21:51:47 +08:00
Ryan VanderMeulen
2e71c50348
Merge inbound to m-c.
2013-09-09 15:55:42 -04:00
Gene Lian
0f3da7edee
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
a43f7058fb
Backed out changeset 9f377abbf13e
2013-09-09 21:22:37 +08:00
Gene Lian
3471836472
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
7c969e03c1
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]
41c3bbb73b
Bug 912884 - Part 2: Update test case. r=hsinyi
2013-09-09 08:19:49 -04:00
Szu-Yu Chen [:aknow]
5e2cd31d22
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
a74bb49601
Backout bug 907585, break B2G Mnw test cases
2013-09-07 19:32:23 +08:00
Vicamo Yang
c293ef20cd
Backout bug 873351, break Mnw test cases.
2013-09-07 19:09:54 +08:00
Vicamo Yang
dde2516d87
Bug 873351 - B2G SMS: move SMS code out of RadioInterfaceLayer to SmsService. r=gene
2013-09-07 14:20:19 +08:00
Vicamo Yang
6f22f53a4a
Bug 907585 [3/3]: some small refinements. r=yoshi
2013-09-07 14:20:11 +08:00
Vicamo Yang
3083861621
Bug 907585 [2/3]: Re-implement message listener registration. r=yoshi
2013-09-07 14:20:07 +08:00
Vicamo Yang
e6e7595374
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
f84d37a565
Bug 864485 - 3/3: Gonk backend specific. r=hsinyi
2013-09-07 14:19:57 +08:00
Vicamo Yang
da62cf5ddc
Bug 864485 - 2/3: DOM & IPC. r=khuey
2013-09-07 14:19:53 +08:00
Ryan VanderMeulen
3b1087b464
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
e641d4540e
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
d186d347f8
Bug 873351 - B2G SMS: move SMS code out of RadioInterfaceLayer to SmsService. r=gene
2013-09-06 16:11:54 +08:00
Vicamo Yang
5be46d040d
Bug 907585 [3/3]: some small refinements. r=yoshi
2013-09-06 16:11:49 +08:00
Vicamo Yang
e9d366f494
Bug 907585 [2/3]: Re-implement message listener registration. r=yoshi
2013-09-06 16:11:46 +08:00
Vicamo Yang
6888679c13
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
4544cb9b61
Bug 864485 - 3/3: Gonk backend specific. r=hsinyi
2013-09-06 16:11:38 +08:00
Vicamo Yang
3d3267810b
Bug 864485 - 2/3: DOM & IPC. r=khuey
2013-09-06 16:11:34 +08:00
Chia-hung Tai
e1b34277e8
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
de97d52db6
Merge mozilla-central and b2g-inbound
2013-09-05 14:53:25 +01:00
Shawn Ku
f46298fd44
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
d0de604837
Backed out changeset 5f709b46eebc (bug 864485)
2013-09-05 11:52:35 +01:00
Ed Morley
40ad4d605c
Backed out changeset f6b637a621ac (bug 864485)
2013-09-05 11:52:32 +01:00
Vicamo Yang
6764f35073
Bug 864485 - 3/3: Gonk backend specific. r=hsinyi
2013-09-05 00:38:57 +08:00
Vicamo Yang
87edb4ea24
Bug 864485 - 2/3: DOM & IPC. r=khuey
2013-09-05 00:38:54 +08:00
Wes Kocher
545fbb7bd2
Merge m-c to inbound
2013-09-04 18:04:50 -07:00
Mike Hommey
f8bc7fa754
Bug 912293 - Remove now redundant boilerplate from Makefile.in. r=gps
2013-09-05 09:01:46 +09:00
Edgar Chen
f6a337a565
Bug 869778 - Part 5: GPS changes for msisdn. r=kchen
2013-08-21 10:45:57 +08:00
Szu-Yu Chen [:aknow]
41f2663310
Bug 909684 - Add enabled and password checking. r=hsinyi
2013-09-03 08:50:55 -04:00
Vicamo Yang
0a622afc85
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
149b61f73c
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
e60116b2e9
Bug 869778 - Part 3: RIL implementation for CDMA MIN. r=allstars.chh
2013-08-12 14:59:17 +08:00
Edgar Chen
8d50f12159
Bug 869778 - Part 2: Move mbdn to iccInfoPrivate. r=allstars.chh
2013-08-21 00:48:11 +08:00
Szu-Yu Chen [:aknow]
597e0f70b3
Bug 909669 - Part 2: Change error code to InvalidParameter (ril, test). r=hsinyi
2013-09-04 08:30:44 -04:00
Gene Lian
85588a95d7
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
27bb8ef640
Bug 911341 - 2/2: Seperate the parcel header handling. r=yoshi
2013-09-04 18:58:26 +08:00
Vicamo Yang
e5836166f6
Bug 911341 - 1/2: B2G RIL - refactor worker_buf. r=yoshi
2013-09-04 18:58:23 +08:00
Ed Morley
540e5885cd
Backed out changeset 9bd4fcd6d084 (bug 864485)
2013-09-04 11:51:02 +01:00
Ed Morley
eb4e3bbe61
Backed out changeset 89113a5b091e (bug 864485)
2013-09-04 11:50:59 +01:00
Ed Morley
07d4151cc6
Backed out changeset 0b45d07ccdee (bug 907585)
2013-09-04 11:50:55 +01:00
Ed Morley
663a0d5d4d
Backed out changeset 0a1f354d13a0 (bug 907585)
2013-09-04 11:50:52 +01:00
Ed Morley
4b2242afc2
Backed out changeset 21b97e0e5a10 (bug 907585)
2013-09-04 11:50:49 +01:00
Ed Morley
9430360ac9
Backed out changeset 8b6235d4c2ac (bug 873351)
2013-09-04 11:50:46 +01:00
Vicamo Yang
dd5f4ce90a
Bug 873351 - B2G SMS: move SMS code out of RadioInterfaceLayer to SmsService. r=gene
2013-09-04 15:53:50 +08:00
Vicamo Yang
bee1a6fcff
Bug 907585 [3/3]: some small refinements. r=yoshi
2013-09-04 15:53:45 +08:00
Vicamo Yang
7d85caf947
Bug 907585 [2/3]: Re-implement message listener registration. r=yoshi
2013-09-04 15:53:42 +08:00
Vicamo Yang
1768c769b4
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
7fd78c720a
Bug 864485 - 3/3: Gonk backend specific. r=hsinyi
2013-09-04 15:53:34 +08:00
Vicamo Yang
db903c7353
Bug 864485 - 2/3: DOM & IPC. r=khuey
2013-09-04 15:53:30 +08:00
Phil Ringnalda
1fdd0f4c23
Back out ed63ede44a82:db85ebf7b0dc (bug 864485) for debug build bustage
2013-09-03 22:33:35 -07:00
Vicamo Yang
69b3fab8c6
Bug 864485 - 3/3: Gonk backend specific. r=hsinyi
2013-09-04 12:46:04 +08:00
Vicamo Yang
c0dad73b20
Bug 864485 - 2/3: DOM & IPC. r=khuey
2013-09-04 12:46:01 +08:00
Jessica Jong
c28312cee9
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
c713072098
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
d118b95a0d
Bug 875934 - Move LIBRARY_NAME to moz.build, batch 3; r=mshal
2013-08-15 09:02:09 -04:00
Shao Hang Kao
4646c53fdb
Bug 874771 - Implement SNTP support (Gecko end). r=gene
2013-06-22 22:22:05 +08:00
Boris Zbarsky
169d28c38a
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
6a10c247ac
Bug 909645 part 2. Don't include ipdl headers in Hal.h. r=ms2ger
2013-08-28 00:14:57 -04:00
Fabrice Desré
c2af499d35
Bug 864932 - Rewrite wifi workers in c++ r=mrbkap
2013-08-27 13:54:51 -07:00
Shawn Ku
7024a21a7f
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
9061973a12
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]
9aa510a537
Bug 882983 - Part 3: Pass ota status (ril). r=hsinyi
2013-08-27 08:25:54 -04:00
Georgia Wang
03e677f0bf
Bug 906948 - Avoid un-assigned rilMessageType checking on GetIMEI. r=yoshi
2013-08-23 18:49:00 +08:00
Edgar Chen
1a47d8c0df
Bug 908135 - Remove dhcp attribute in nsINetworkInterface. r=vyang, vchang
2013-08-22 17:43:53 +08:00
Hsin-Yi Tsai
e95414208a
Bug 905109 - Part 4: add getter for members in Buf. r=hsinyi
2013-08-23 23:45:51 +08:00
"allstars.chh"
dde6a31bca
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"
02d33e4fb6
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"
40529c8420
Bug 905109 - Part 1: Move Buf to worker_buf.js. r=bent, vicamo.
2013-08-22 12:17:40 +08:00
Hsin-Yi Tsai
b162985770
Bug 908636 - B2g RIL: return false in setCallingLineIdRestriction. r=vicamo
2013-08-23 20:42:20 +08:00
Marco Chen
4bbb968982
Bug 904531 - AudioManager should actively ask settings DB for volume initialization. r=mwu
2013-08-23 11:29:11 +08:00
Ken Chang
911bdf0645
Bug 901232 - B2G RIL: Data call not working on Nexus S, r=vyang
2013-08-06 16:43:45 +08:00
Dave Hylands
a2da39cd38
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
2aaadce5ac
Merge mozilla-central and b2g-inbound
2013-08-22 12:05:51 +01:00
Jessica Jong
e623140a57
Bug 832808 - B2G Multi-SIM: To support data call function for multi-SIM. r=vicamo
2013-08-22 18:06:36 +08:00
Ms2ger
4fb1aa6786
Bug 883284 - Part c: Move LIBXUL_LIBRARY into moz.build (d-e); r=mshal
2013-08-22 08:56:00 +02:00
Ms2ger
4807f1c86c
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
3e2f763681
Bug 772765 - part3 - RIL impl. r=vicamo
2013-07-06 18:40:58 +08:00
Jessica Jong
8fcfcfa162
Bug 905955 - B2G RIL: mms data connection does not get disconnected. r=vicamo
2013-08-20 19:31:10 +08:00
Hsin-Yi Tsai
d14af73c2a
Bug 905076 - [wasabi] Temporary CLIR not work on CDMA. r=vicamo
2013-08-16 16:18:31 +08:00
Georgia Wang
f17d9f1eb0
Bug 795252 - Part 4: Modify xpcshell STK tests. r=yoshi
2013-08-16 10:23:12 +08:00
Georgia Wang
3d960f1c26
Bug 795252 - Part 2: Refactore StkProactiveCmdHelper. r=yoshi.
2013-08-16 09:59:55 +08:00
Georgia Wang
566c3aaf91
Bug 795252 - Part 1: Refactore StkCommandParamsFactory. r=yoshi
2013-08-15 15:30:39 +08:00
Edgar Chen
b023d06977
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
128aa57522
Merge mozilla-central and b2g-inbound
2013-08-15 13:37:27 +01:00
Ed Morley
a4aa297061
Merge latest green b2g-inbound changeset and mozilla-central
2013-08-15 11:58:48 +01:00
Gregory Szorc
df453f8483
Bug 850380 - Derecursify and optimize XPIDL processing and move into precompile tier; r=glandium
2013-08-14 08:40:25 -07:00
Edgar Chen
675fe6b2aa
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
3f249cd751
merge mozilla-central to b2g-inbound
2013-08-14 15:02:24 +02:00
Carsten "Tomcat" Book
c32ebba83a
merge b2g-inbound to mozilla-central
2013-08-14 14:11:03 +02:00
Ms2ger
1a5ae526d9
Bug 901323 - Don't include nsContentUtils.h unnecessarily; r=jlebar
2013-08-14 08:56:21 +02:00
Shawn Ku
c690916d16
Bug 899400 - B2G RIL: Call Waiting MMI functionality. r=hsinyi
2013-08-14 16:16:04 +08:00
poojas
c6b265d42d
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]
84c1e267ae
Bug 887690 - Part 4: Test emergency callback mode (xpcshell-test). r=hsinyi
2013-08-14 08:50:48 -04:00
Szu-Yu Chen [:aknow]
a3bf81f817
Bug 887690 - Part 3: Add emergency callback mode support (ril). r=hsinyi
2013-08-14 08:50:36 -04:00
Hsin-Yi Tsai
7c0bf21a79
Bug 905090 - B2G RIL: undefined state in kScreenStateChangedTopic, RadioInterfaceLayer.js. r=vicamo
2013-08-14 18:11:47 +08:00
Szu-Yu Chen [:aknow]
66866967d3
Bug 905007 - Fix test_ril_worker_buf.js. r=vicamo
2013-08-14 16:45:27 +08:00
Szu-Yu Chen [:aknow]
71b08ea4dd
Bug 905050 - Fix test_ril_worker_mmi.js. r=vicamo
2013-08-14 16:45:22 +08:00
Marco Chen
0ff2dec9e6
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
bae5feb8db
Bug 899885 - 2/2: fix all communications to ril_worker. r=yoshi,gene
2013-08-13 20:14:13 +08:00
Vicamo Yang
f044e44b41
Bug 899885 - 1/2: B2G RIL - Callback-based worker messaging. Add WorkerMessenger. r=yoshi
2013-08-13 20:14:10 +08:00
Vicamo Yang
9ddf2cea9c
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
afcfaf7a01
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
296e7d9e55
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
3bc7e2d3a6
Bug 899418 - B2G RIL: remove deprecated interface methods/attributes from nsIRadioInterface. r=vicamo
2013-08-13 11:29:02 +08:00
Ryan VanderMeulen
4d14292521
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]
d64d6f4fe0
Bug 887690 - Part 4: Test emergency callback mode (xpcshell-test). r=hsinyi
2013-08-12 08:25:42 -04:00
Szu-Yu Chen [:aknow]
3784ca26da
Bug 887690 - Part 3: Add emergency callback mode support (ril). r=hsinyi
2013-08-12 08:25:24 -04:00
Szu-Yu Chen [:aknow]
9819705f86
Bug 869776 - Part 2: Test cell broadcast config. r=vicamo
2013-08-12 08:22:31 -04:00
Szu-Yu Chen [:aknow]
df344dacdf
Bug 869776 - Part 1: Support cdma cell broadcast config. r=vicamo
2013-08-12 08:22:15 -04:00
Yoshi Huang
11e63598f1
Bug 902769 - Part 2: xpcshell tests for facility lock. r=vicamo
2013-08-09 15:47:33 +08:00
Yoshi Huang
15e8125026
Bug 902769 - Part 1: Patch. r=vicamo
2013-08-08 17:04:07 +08:00
Yoshi Huang
bd04de3d30
Bug 895169 - B2G RIL: Check contact attributes values when export to SIM. r=vicamo
2013-08-09 16:00:38 +08:00
Edgar Chen
909bba21f8
Bug 902380 - Have a consistent operator information in ril_worker and RadioInterfaceLayer. r=hsinyi
2013-08-08 17:29:42 +08:00
Ryan VanderMeulen
febf24bb96
Merge inbound to m-c.
2013-08-09 19:08:45 -04:00
Ryan VanderMeulen
f3a8bfda31
Merge m-c to b2g-inbound.
2013-08-08 16:24:53 -04:00
Szu-Yu Chen [:aknow]
0ae2a92f0d
Bug 905510 - Handle imported file not found. r=hsinyi
2013-08-15 08:25:56 -04:00
Carsten "Tomcat" Book
f66afd4eed
merge mozilla-central to mozilla-inbound
2013-08-08 14:01:54 +02:00
Carsten "Tomcat" Book
3dec61c518
merge b2g-inbound to mozilla-central
2013-08-08 13:33:12 +02:00
Gene Lian
e24465fc4b
Bug 901887 - [RIL][Contacts] Saving to SIM doesn't work. r=allstars.chh
2013-08-08 16:16:50 +08:00
Yoshi Huang
d5a2e8101c
Bug 900321 - Part 3: const card lock types to fix style nits. r=vicamo
2013-08-07 12:15:39 +08:00
Yoshi Huang
e99a1bfab2
Bug 900321 - Part 2: Update RIL and test case. r=vicamo
2013-08-05 15:23:10 +08:00
Edgar Chen
bbaebdb60b
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
2ed93706c5
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
25642de515
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
8ce53f9ffd
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
bcb99ed62f
Merge m-c to inbound.
2013-08-06 14:24:39 -04:00
Nicholas Nethercote
9624be5713
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
2ac14b6276
Merge m-c to inbound.
2013-08-05 20:00:43 -04:00
Szu-Yu Chen [:aknow]
ae052c7acf
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]
1ee6dd90bd
Bug 743150 - Part 3: Handle supplementary service notification in RIL. r=hsinyi
2013-08-05 16:28:31 -04:00
Carsten "Tomcat" Book
5c34d25a48
Merge b2g-inbound to m-c
2013-08-05 11:22:48 +02:00
Szu-Yu Chen [:aknow]
4aea830dd1
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
4e6f3c8e19
Merge latest green b2g-inbound changeset and mozilla-central
2013-08-02 13:30:22 +01:00
Vincent Chang
df25dad82d
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
7974384594
Bug 835237 - Part 1: Update signal strength for CDMA/EVDO network. r=hsinyi
2013-07-22 14:35:28 +08:00
Gene Lian
e620d61236
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]
6749b17ad4
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]
8a26e12cc1
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
c001d7ff7e
Bug 897869 - [b2g-ril] Need to keep CLIR settings across reboots. r=vicamo
2013-07-31 09:56:43 +02:00
Yoshi Huang
77f90a4418
Bug 895960 - Part 3: revise parseMccMncFromImsi. r=hsinyi
2013-07-30 17:34:00 +08:00
Yoshi Huang
8cd7bf6abd
Bug 895960 - Part 2: Test cases for reading PBR. r=hsinyi
2013-07-30 17:33:00 +08:00
Yoshi Huang
972966a6d8
Bug 895960 - Part 1: Patch. r=hsinyi
2013-07-23 14:34:30 +08:00
Michael Wu
cd2a9247d7
Bug 899769 - Fix build of AudioManager.cpp when bluetooth is disabled, r=rlin
2013-07-30 22:44:48 -04:00
Ryan VanderMeulen
fd758076bd
Merge m-c to inbound.
2013-07-30 18:08:18 -04:00
Ryan VanderMeulen
769a4293c7
Merge m-c to birch.
2013-07-30 13:11:10 -04:00
Ryan VanderMeulen
09b200b169
Merge m-c to inbound on a CLOSED TREE.
2013-07-30 09:23:28 -04:00
Ryan VanderMeulen
c3ded710d4
Backed out changesets bc5f5ce22ae3 and 3d682482e90c (bug 880643) for Marionette failures.
2013-07-30 08:52:19 -04:00
Edgar Chen
7c40ec1655
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
6712768b30
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]
cf63111369
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]
dd86e47e53
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
98a0425f0f
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
771993df05
Bug 898634 - Add some logging for volumes created via volume.cfg. r=jwwang
2013-07-29 16:41:07 -07:00
Fernando Jiménez
75bd97c435
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
7bd9efe0db
Merge m-c to birch.
2013-07-29 16:07:59 -04:00
Jose Antonio Olivera Ortega
ba72368f1d
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
2dfcd8c42d
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
64399c7810
Bug 899028 - [B2G] [CDMA] reject an incoming call. r=vicamo
2013-07-29 18:47:24 +08:00
Ed Morley
40350f10a6
Merge mozilla-central and inbound
2013-07-29 15:42:41 +01:00
Jon Coppeard
20fb51afdd
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
c82417d73f
Bug 898812 - Add support for JB MR2's dhcp_do_request, r=vchang
2013-07-28 00:39:03 -04:00
Carsten "Tomcat" Book
72350922ef
Merge mozilla-central to mozilla-inbound
2013-08-05 11:59:14 +02:00
Vincent Chang
337c84b72b
Bug 884131 - Messages to netd need sequence number on gonk-JB. r=dhylands
2013-08-05 12:16:14 +08:00
Ehsan Akhgari
ef4b479714
Bug 872127 - Part 2: Replace mozilla/StandardInteger.h with stdint.h; r=Waldo,ted
2013-07-30 10:25:31 -04:00
Joey Armstrong
56ab717da3
Bug 870370 - Move EXTRA_COMPONENTS to mozbuild (file batch #3 ); r=mshal
2013-06-11 16:38:22 -04:00
Edgar Chen
83aba14176
Bug 869768 - Part 3: RIL implementation for roaming preference. r=hsinyi
2013-06-10 15:47:03 +08:00
Carsten "Tomcat" Book
ce93df92db
Backed out changeset ae8d72538dee (bug 897484) for b2g bustage
2013-07-26 12:34:25 +02:00
Jon Coppeard
9709d43d76
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
845759d3a1
Bug 894281 - Process emergency call once network is really available. r=vicamo
2013-07-24 15:06:45 +02:00
Edgar Chen
e2bbe7d8ee
Bug 882984 - Part 4: Fix xpcshell tests. r=hsinyi
...
--HG--
extra : rebase_source : 40890b4ac9b3cc242b7ab98ff338c67859cb9447
2013-07-04 12:31:14 +08:00