Commit Graph

438 Commits

Author SHA1 Message Date
Justin Lebar
5c2d14d8ce Bug 836654 - Part 0: Add constants CONTENT_PROCESS_{UNKNOWN_ID,MAIN_ID} to HalTypes.h and remove the equivalent constants from ContentParent.h. r=cjones 2013-02-14 15:41:29 -05:00
Justin Lebar
663ad8052f Bug 837856 - Rename hal_sandbox::IsHalChildLive() to HalChildDestroyed(). r=mounir
The return value stays the same (that is, the function was mis-named).
2013-02-11 23:09:25 -05:00
Justin Lebar
85cdeba441 Bug 838625 - Add hal::ProcessPriorityToString and use it in ProcessPriorityManager logging. r=cjones
--HG--
extra : rebase_source : 0a9ecf848a9c6c3ba37acafa24c775154ccb417f
2013-02-08 14:32:23 +00:00
Alan Huang
42a6d75810 Bug 839312 - Specify gonk low-memory-killer priorityClasses in the correct order and fix typo in b2g.js which was preventing us from giving the kernel one of the necessary priority classes. r=jlebar 2013-02-08 14:09:26 +00:00
Marco Chen
1e51341257 Bug 827707 - [GonkSensor] Sensor field in sensors_event_t doesn't mean the index of sensors list from HAL. r=mwu 2013-01-24 10:45:07 +08:00
Mats Palmgren
6c53161814 Bug 786533 - Replace NS_MIN/NS_MAX with std::min/std::max and #include <algorithm> where needed. r=ehsan 2013-01-15 13:22:03 +01:00
Philipp von Weitershausen
b4c929aa87 Bug 823798 - Route FM radio through analog path. r=mwu a=blocking-b2g 2013-01-14 22:06:41 -08:00
Trevor Saunders
10701d89a1 no bug - mark several classes final to avoid warnings about deleting objects of polymorphic type 2013-01-11 04:43:29 -05:00
Thinker K.F. Li
e40ab6d2f9 Bug 817939 - restart ioctl with EINTR for FMRadio. r=jlebar 2013-01-09 10:13:46 +01:00
Gene Lian
7b6d6463eb Bug 821671 - Check alarm API parameters in the parent (part 1, provide .AssertAppProcess() with different types). r=sicking 2012-12-22 19:53:38 +08:00
Kan-Ru Chen (陳侃如)
41defd0d01 Bug 793105 - Add a "backgroundPerceivable" class for audio-channel-content. r=jlebar,roc 2013-01-05 13:03:51 +08:00
Chris Jones
90fdd69121 Bug 823610: Make discarding GL contexts of foreground pages on memory pressure pref-able, and pref off for b2g. r=jgilbert,jlebar 2013-01-03 15:39:25 -08:00
Chris Jones
cafad920f2 Rollup of bug 821192: Ensure that content processes don't see an inconsistent app dir. r=bent,dhylands
Bug 821192, part 1: Fix the watchdog timeout code. r=dhylands
Bug 821192, part 2: Add an interface to join all live content processes. r=bent
Bug 821192, part 3: Join all subprocesses before restarting the main process, when we're e.g. about to apply an update. r=dhylands
2012-12-28 01:45:16 -08:00
Chris Jones
3ed2e673a5 Bug 822398: Use PL_DHASH_REMOVE to remove an entry we're enumerating. r=kanru 2012-12-27 02:43:55 -08:00
Marco Chen
f5c8c08786 Bug 823203 - HalParent::ActorDestroy() needs to handle the UnregisterSwitchObserver() when content process is killed. r=jlebar, a=blocking-basecamp 2012-12-21 16:37:58 +08:00
Justin Lebar
fcb9bb724a Bug 821440 - Allow the B2G homescreen to run in the background with a decreased oom_score_adj compared to vanilla background apps. r=cjones 2012-12-18 21:37:35 -05:00
Justin Lebar
b96798e203 Bug 819791 - Part 5: Remove an unnecessary TArray copy in hal/sandbox. r=mounir 2012-12-18 20:16:06 -05:00
Thomas Zimmermann
e93cd33a7a Bug 758103 - Return charging time of zero if no battery interface exists. r=mounir, r=dhylands
On the PandaBoard, and probably other platforms, no battery exists and
the related kernel interfaces are missing. The HAL returns 'charging' at
a battery level of 100%. The charging time is set to 'unknown'. This is
inconsistent according to the battery manager.

With this patch, the returned charging time is set to zero, which fulfills
the battery manager's requirements. The patch also cleans up and simplifies
the source code.
2012-11-29 20:18:46 +01:00
Jeff Walden
7146c23e80 Bug 820570 - Move mozilla::DebugOnly into DebugOnly.h to pare down the grab-baggish Util.h. r=Ms2ger 2012-12-14 18:58:45 -05:00
Gregor Wagner
5c754bc6b4 Bug 820135 - Preferences: We don't save prefs when we reboot. r=cjones 2012-12-12 15:41:07 -08:00
Josh Matthews
3d1a03275e Backed out changeset ea39e0af0831 (bug 820135) 2012-12-12 02:23:10 -05:00
Gregor Wagner
f79303850c Bug 820135 - Preferences: We don't save prefs when we reboot. r=cjones 2012-12-11 22:39:25 -08:00
Steven Lee
acd3ec7128 Bug 817919 - Remove FM radio implementations in hal_sandbox. r=cjones 2012-12-04 08:57:31 -08:00
Justin Lebar
1a74683d84 No bug: Fix whitespace error. DONTBUILD 2012-12-03 16:56:54 -05:00
Steven Lee
d0463854ea Bug 809106 - RegisterSwitchObserver through hal::Sandbox. r=jlebar 2012-11-29 17:52:02 -05:00
Boris Zbarsky
2df1c922cc 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
Kan-Ru Chen (陳侃如)
a72916e8c5 Bug 814822 - Notify wake lock change when content crashes. r=jlebar 2012-11-27 10:28:11 +08:00
Kan-Ru Chen (陳侃如)
5a97ac6956 Bug 806363 - Remove wake locks on content-shutdown. r=jlebar 2012-11-17 23:05:18 +08:00
Boris Zbarsky
2d87c88a68 Bug 812086 part 3. Convert internal consumers of mozHidden and mozVisibilityState to the unprefixed versions. r=smaug 2012-11-16 14:22:56 -08:00
Steven Lee
819f66d79e Bug 808983 - Don't call hal_sandbox::Vibrate when ipc is broken. r=jlebar 2012-11-08 14:35:03 -05:00
Steven Lee
6240239870 Bug 800263 - [FM Radio] Launch the FM Radio with headphone already plugged-in will cause screen freeze. r=cjones 2012-11-06 22:32:00 -05:00
Alan Huang
4b68729755 Bug 802029 - When PollSensors() found one of its event type is SENSOR_UNKNOWN, don't create a SensorRunnable. r=mwu 2012-10-31 15:03:19 +08:00
Andrea Marchesini
7bdf86cb1a Bug 703612 - Make DBUS calls asynchronous to prevent slowness because of DBus daemon being overloaded in Battery API UPower backend. r=mounir 2012-11-02 16:11:50 -04:00
Justin Lebar
e5ca33789e Bug 771195 - Fire memory pressure events on Gonk. r=dhylands 2012-10-31 13:29:14 -04:00
Nathan Froyd
bd55a07f0e Bug 806618 - rewrite PR_NewLogModule calls to not generate static initializers; r=ehsan 2012-10-29 19:32:10 -04:00
Benjamin Chen
3d161a9f75 Bug 797817 - Update the battery indicator led when receiving battery status change. r=cjones 2012-10-22 11:10:05 +08:00
Gene Lian
7412405399 Bug 801096 - [settings] Set-Automatically for time should take effect *immediately* instead of waiting on next NITZ coming (part 1). r=jlebar 2012-10-23 15:15:43 +08:00
Shih-Chiang Chien
3a4a9e32aa Bug 790393 - Add MozPower.factoryReset() for factory reset. r=cjones, r=vingtetun, sr=sicking 2012-10-04 17:28:34 +08:00
Isaac Aggrey
c407ef6549 Bug 794510: Part 4 - Use PR_NewLogModule instead of PR_LOG_DEFINE; r=ehsan,wtc 2012-10-13 15:56:35 -05:00
Steven Lee
d8013ae196 Bug 790499 - Time API: Call JS_ClearDateCaches() to update Date object's timezone when the system timezone is reset, r=jlebar 2012-10-17 00:26:00 -04:00
Andreas Gal
db79ec3cdf Bug 800533 - Don't handle magnetic field sensor, r=mwu 2012-10-16 01:11:06 -04:00
Steven Lee
5c5f9201da Bug 793759 - Implement HalChild::ActorDestroy and prevent HalChild calls to HalParent after ActorDestroy is called. r=cjones 2012-10-06 21:53:22 -04:00
Gina Yeh
349708da74 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
Gene Lian
597e68014f Bug 793970 - Reuse nsAppStartup's watchdog to compulsively power-off/reboot/quit Gecko if profile synchronizing hangs. r=cjones 2012-10-02 15:26:32 +08:00
Doug Turner
8b81f97143 Bug 790503 - On Mac Mini, defaultCalibration reads outside of sensors[]. r=jruderman@gmail.com,blassey 2012-10-01 20:45:32 -07:00
Chris Jones
555289cbcc Bug 794188: Check the fmradio permission at process boundaries. r=jlebar 2012-09-29 15:09:19 -07:00
Vincent Chang
d190168027 Bug 793558 - Time API: changes does not persist after a restart. r=mwu 2012-09-28 14:38:50 +08:00
Gina Yeh
88282bd920 Bug 794903 - Final version: BluetoothScoManager implementation, r=qdot 2012-09-29 17:39:05 +08:00
Gene Lian
372d6e5d0f Bug 790527 - When rebooting/powering off, go through normal gecko shutdown. r=bsmedberg,sr=cjones 2012-09-26 17:12:33 +08:00
foudfou
d72827c0aa Bug 785542 - Convert usages of PR_MIN and PR_MAX to NS_MIN and NS_MAX; r=ehsan
Occurences of PR_MAX in layout/style/nsCSSProps.cpp and xpcom/glue/nsTArray.h
can not be converted without C++11 support (constexpr).

--HG--
extra : rebase_source : 3b4f7e26690fad487dd11594449948411d4e79bc
2012-09-27 23:44:47 +02:00
Michael Wu
c193c5bd1b Bug 793809 - Take FM radio initialization off main thread, r=jlebar 2012-09-26 15:35:40 -04:00
Thomas Zimmermann
9f5b4e9beb Bug 794051 - Read battery status via fgets. r=dhylands
The call to fscanf for reading the battery status used an incorrect pointer in its
arguments. The code only worked because the first byte of a character array is the
first element within the array. To fix this problem, fscanf has been replaced by
fgets, which is less error prone and checks the length of the supplied array.

Additionaly, we don't want to operate on an undefined result if fgets fails. In
this case we assume that the battery is not being charged.
2012-09-26 08:45:06 -07:00
Gene Lian
ee4deb2801 Bug 794127 - hal::AdjustSystemClock should take a 64-bit value. r=cjones 2012-09-26 11:51:29 +08:00
Chris Jones
e5bd906067 Bug 793479: Update C++ permission-checking API to match that of the message-manager one. r=jlebar 2012-09-25 11:52:30 -07:00
Marco Chen
b8303ae2fa Bug 791329 - Let GonkSwitch to know the status about headset or headphone from uevent. r=dhylands 2012-09-25 19:03:13 +08:00
Reuben Morais
a81853fb68 Bug 793418 - OS X Battery Backend: Report time to charge when available. r=mounir 2012-09-25 15:32:02 +01:00
Steven Lee
a8d94e6a67 Bug 792443 - hal::RegisterSystemTimeChangeObserver should register the observer through sandbox, r=jlebar 2012-09-23 13:00:32 -04:00
Reuben Morais
14c7b302f8 Bug 696045 - Implement Mac backend for Battery API. r=BenWa,mounir 2012-09-21 23:36:14 -04:00
Steven Lee
971b4af189 Bug 749053 - FM radio support: hal implementation, r=jlebar
Hal interface by Steven Lee (slee), gonk backend by Michael Wu (mwu).
2012-09-19 11:17:13 -04:00
Ehsan Akhgari
609f916ab7 Backout changeset 9f16bba541cc (bug 790499) becasuse of build bustage 2012-09-21 15:57:42 -04:00
Steven Lee
8b5c66d713 Bug 790499 - Time API: Call JS_ClearDateCaches() to update Date object's timezone when the system timezone is reset, r=jlebar
--HG--
extra : rebase_source : ddd264047c861c3244dfdf43e695705ec675f066
2012-09-21 14:56:01 -04:00
Dave Hylands
64b2aad409 Bug 792682 - GonkHal vibrator code incorrectly uses a weak reference. r=qDot 2012-09-19 23:34:07 -07:00
Dave Hylands
56bcd082b7 Bug 792529 - ASSERTION: VibratorRunnable not thread-safe. r=qDot 2012-09-19 13:55:10 -07:00
Ehsan Akhgari
71d9f962d0 Backout bug 792109, bug 749053 and bug 779500 because of leaks in debug tests 2012-09-19 15:42:18 -04:00
Michael Wu
fedd6fd47f Fix red from broken FallbackFMRadio.cpp from bug 749053 2012-09-19 14:16:13 -04:00
Steven Lee
233c77366a Bug 749053 - FM radio support: hal implementation, r=jlebar
Hal interface by Steven Lee (slee), gonk backend by Michael Wu (mwu).
2012-09-19 11:17:13 -04:00
Mounir Lamouri
4a90f2279e Bug 787534 - Remove Portrait and Landscape special ScreenOrientation values. r=jlebar 2012-09-19 17:28:16 +01:00
Justin Lebar
230a7b66df Bug 791261 - Remove the requirement that a TabParent must be Active in order to send vibrations. Also remove TabParent::Active(). r=cjones 2012-09-19 09:48:38 -04:00
Chris Jones
71d00aab03 No bug: Update the cross-process permission checks for time permissions to match the DOM check. r=jlebar 2012-09-18 20:25:12 -07:00
Marco Chen
612819ef1f Bug 788118 - Non-continuous type of sensor blocked thread on polling so the action of switching sensor can't be done on blocked thread. r=mwu
1. Moving switching sensor from thread to main thread.
2. Moving the control of sensor hw module from SensorDevice to GonkSensor.
   Avoid the 5 seconds from Binder IPC timeout for geting Android Battery Service.
2012-09-18 10:51:35 +08:00
Steven Lee
7c5f6e7c41 Bug 791682: Hal's sSystemTimeObserver should be called sSystemTimeObservers, r=jlebar 2012-09-17 08:48:00 -04:00
Ms2ger
8976774677 Bug 787933 - Stop using stdin types in IPC code; r=bsmedberg+cjones sr=cjones 2012-09-17 10:37:20 +02:00
Thomas Zimmermann
b4126e3818 Bug 785171 - Support OOM adjustment via /proc/<pid>/oom_score_adj. r=dhylands
The interface /proc/<pid>/oom_score_adj has been added as a replacement for /proc/<pid>/oom_adj. It
is now supported and used by default within Gonk. If oom_scrore_adj is not available, the code falls
back to the old interface.
2012-09-14 11:52:07 -07:00
Thomas Zimmermann
b528bd795a Bug 785171 - Clamp OOM adjustment settings to valid range. r=dhylands
The supported OOM adjustment is between -1000 to 1000. If the user specifies a value outside
this range, we clamp it and output a warning.
2012-09-14 11:52:07 -07:00
Thomas Zimmermann
3efc48b618 Bug 785171 - Adopt semantics of /proc/<pid>/oom_score_adjust in preferences. r=dhylands
The preference settings

  hal.processPriorityManager.gonk.backgroundOomAdjust,
  hal.processPriorityManager.gonk.foregroundOomAdjust, and
  hal.processPriorityManager.gonk.masterOomAdjust

have been replaced by

  hal.processPriorityManager.gonk.backgroundOomScoreAdjust,
  hal.processPriorityManager.gonk.foregroundOomScoreAdjust, and
  hal.processPriorityManager.gonk.masterOomScoreAdjust.

The new settings adopt the semantics of /proc/<pid>/oom_score_adj and the default
values have been changed accordingly. The interface to the OOM killer interface is
still /proc/<pid>/oom_adj, and its input values are computed from the settings.
2012-09-14 11:52:07 -07:00
Thomas Zimmermann
4b7e4d7301 Bug 785171 - Return success from WriteToFile. r=dhylands
For supporting multiple files in the OOM adjustment, we need to know if a file
has been successfully written to. in this case WriteToFile now returns 'true',
otherwise it returns 'false'.
2012-09-14 11:52:07 -07:00
Thomas Zimmermann
b3aeb0dbc8 Bug 785171 - Whitespace cleanups. r=dhylands 2012-09-14 11:52:07 -07:00
Jesse Ruderman
b1bda19a4e Bug 790781 - fix bustage from bug 714358. 2012-09-12 17:25:55 -07:00
Steven Lee
18e48d0ffd Bug 714358 System time change implementation, r=mounir 2012-09-11 02:40:00 -04:00
Mounir Lamouri
42ecf3a4fd Bug 787532 - Update Android HAL backend to take into account new screen lock values. r=jlebar 2012-09-11 11:57:20 +01:00
Chris Jones
e2b60610ac Bug 789130: Unregister hal observers on HalParent::ActorDestroy(), and make Unregister*() functions resilient to unregister-of-not-registered observers. r=jlebar 2012-09-06 14:58:36 -07:00
Jan Beich
1f2f7e2d14 Bug 788414 - DragonFly target doesn't use BSD suffix in uname -s. r=landry 2012-09-06 12:01:55 +01:00
Gene Lian
33729b0725 Bug 783021 - System time: listen to timezone settings changes and update system timezone (part 1). r=cjones 2012-08-23 17:00:00 +08:00
Marco Chen
1d67969a6c Bug 773792: Remove unused field SensorStatus::data and make SensorStatus::count as a array of int[] for fixing an instance of creating/desctroying XPCOM objects from a static constructor/deconstructor. r=jlebar 2012-09-04 17:56:20 +08:00
Marshall Culpepper
5a279b497f Bug 784728: Make Gonk's battery observer a RefPtr, fixing an abort on process exit in debug builds. r=jlebar 2012-08-29 12:32:56 -03:00
Chris Jones
a1068719d6 Bug 786573: The XPCOM thread manager can't shut down the sensor thread, so use one of our other various thread types for the sensor thread. r=bent
--HG--
extra : rebase_source : 07b0fc9ccd710601948c1cd10098fa2b8c681932
2012-08-29 12:26:18 -03:00
Rafael Ávila de Espíndola
3ae64f38a4 Bug 786148 - s/IPC/ipc/. r=ted.
This makes our builds a bit more reproducible. Without it when processing

#include "IPC/IPCMessageUtils.h

we end up in

#include "ShadowLayers.h"

which in the final XUL translates into the symbol (run nm -a to see it):

 - 00 0000   SOL ../../../../gfx/layers/IPC/ShadowLayers.h

now when some file in gfx/layers/ipc does

#include "ShadowLayres.h"

the file found is the local one with the lowercase directory name and we end up
with

 - 00 0000   SOL ../../../../gfx/layers/ipc/ShadowLayers.h

--HG--
extra : rebase_source : 96c68f6a3448eedaa280039960df911a9c707cac
2012-08-28 08:41:04 -04:00
Chris Jones
dafc895290 Bug 782460: Fix hal enum serializers, make wake lock permission checking match the DOM's, and log a message when an app process fails a backstop permission check. r=gal 2012-08-25 15:38:04 -07:00
Chris Jones
be7c3dfea6 Bug 785166: Protect against already-canceled vibrations. r=jlebar 2012-08-23 17:32:00 -07:00
Chris Jones
af0c8edd8d Backed out changeset df85150b8d2f 2012-08-23 17:33:12 -07:00
Chris Jones
0a9343bc64 Bug 785167: Protect against already-canceled vibrations. r=jlebar 2012-08-23 17:32:00 -07:00
Ehsan Akhgari
0fd9123eac Bug 579517 - Part 1: Automated conversion of NSPR numeric types to stdint types in Gecko; r=bsmedberg
This patch was generated by a script.  Here's the source of the script for
future reference:

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*/.hg*" \
       ! -wholename "obj-ff-dbg*" \
       ! -name nsXPCOMCID.h \
       ! -name prtypes.h \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert PRInt8 int8_t
convert PRUint8 uint8_t
convert PRInt16 int16_t
convert PRUint16 uint16_t
convert PRInt32 int32_t
convert PRUint32 uint32_t
convert PRInt64 int64_t
convert PRUint64 uint64_t

convert PRIntn int
convert PRUintn unsigned

convert PRSize size_t

convert PROffset32 int32_t
convert PROffset64 int64_t

convert PRPtrdiff ptrdiff_t

convert PRFloat64 double
2012-08-22 11:56:38 -04:00
Chris Jones
2573176d5c Bug 776835: Check process capabilities in hal. r=blassey,jlebar 2012-08-16 12:34:53 -07:00
Phil Ringnalda
cf09173698 Backout 5439489dc320, 983f76488e59, 7a92558a8dec (Bug 714358) for debug build assertions and leaks 2012-08-07 22:18:27 -07:00
Steven Lee
b7cf4d659c Bug 714358: System time change implementation, r=mounir 2012-08-07 19:20:00 -04:00
Justin Lebar
4c0e821bfa Bug 768832 - Set OOM adjust for background windows. r=bz,cjones 2012-08-05 01:09:39 -04:00
Mike Hommey
6173fa297f Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted 2012-08-04 20:26:44 +02:00
Steven Lee
893e256be9 Bug 745078 Get switch device states at any time, r=dhylands 2012-08-01 07:58:58 -07:00
Gene Lian
abe5408e36 Bug 776785 - Alarm API - hal::SetAlarm takes |long|s, but should instead take PRInt32s. r=jlebar 2012-07-31 10:52:57 +08:00
Aryeh Gregor
e806eeab4f Bug 777292 part 2 - Change all nsnull to nullptr 2012-07-30 17:20:58 +03:00
Jeff Muizelaar
910481d249 Bug 777381. Use SIGUSR1 instead of SIGUSR2 to avoid interferring with profiling. r=cjones
SIGUSR2 was originally chosen to avoid interferering with dalvik. We don't need
to avoid that on B2G.

--HG--
extra : rebase_source : 99098a28daee28933f379cfa520a433c44d5465d
2012-07-26 12:15:26 -04:00
Chris Jones
941f35fcd0 Bug 777890: The cached value is valid after we synchronously Get() it, as far as we know. r=jlebar 2012-07-27 11:39:44 -07:00
Justin Lebar
a863832283 Bug 772987 - Part 2: Use Static{Auto,Ref}Ptr where appropriate. r=mounir
--HG--
extra : rebase_source : 4e3e72ba53cd0177160f80231eebeb4972119eec
2012-07-26 15:33:45 -04:00
Brian R. Bondy
b2ba1e0a50 Bug 774140 - Remove code duplication for IsVistaOrLater. r=bsmedberg 2012-07-25 10:23:26 -04:00
Joshua Cranmer
4ad48824ad Bug 702877 - Replace NS_OVERRIDE with MOZ_OVERRIDE. r=ehsan
--HG--
extra : rebase_source : 1843575683c3897f96f3966cbce26140ff1a7d90
2012-07-06 13:15:45 -05:00
Gervase Markham
44a28dd9d7 Bug 774614 - Relicense Gonk/Gecko interface code to Apache License 2.0. 2012-07-20 10:10:44 +01:00
Rafael Ávila de Espíndola
2223abe15c Bug 774015 - Fix -Wdelete-non-virtual-dtor warning. r=justin.lebar 2012-07-15 11:13:15 -04:00
Mounir Lamouri
d418cd569b Bug 772373 - Force warnings as errors in hal/. r=jlebar 2012-07-12 21:34:18 +02:00
Reuben Morais
f5a805349a Bug 772524 - Fix "data argument not used by format string" warnings in smslib.mm. r=mounir 2012-07-10 18:31:04 -04:00
Reuben Morais
b75ec232b5 Bug 772351 - Fix deprecated writable strings warnings on smslib.mm. r=mounir 2012-07-10 18:31:04 -04:00
Gene Lian
618d0214e1 Bug 749551 - Alarm API (Hal/Gonk). r=cjones 2012-07-06 12:42:10 +02:00
Kan-Ru Chen
5aea9e8cc3 Bug 768364 - Clear sLockTable on shutdown r=jlebar 2012-07-06 10:09:46 +08:00
Ed Morley
7a600d2b9c Backout 1dba66cfad9a, ed768b821da1, 23fd9a8d0c9a, 1e90805d96aa, 07425f0e921e (bug 749551) for M3 failures 2012-07-03 11:23:54 +01:00
Gene Lian
bf26b0788c Bug 749551 - Alarm API (Hal/Gonk). r=cjones 2012-07-03 11:24:13 +02:00
Justin Lebar
a5ce138092 Bug 769585 - Fix vim modelines. DONTBUILD rs=mrbkap 2012-06-29 12:42:59 +02:00
Cervantes Yu
a4fdf883d8 Bug 764773: Fix memory leak in UeventPoller. r=cjones 2012-06-18 12:13:30 +02:00
Ryan VanderMeulen
891e38e528 Revert c39d36167b99 due to a horribly munged backout. 2012-06-10 19:44:50 -04:00
Ryan VanderMeulen
f497d31a0a Backout the bug 754202 backout due to orange. 2012-06-10 19:37:47 -04:00
Steven Lee
441c58fd83 Bug 761796 Fixed the assertion failure. r=mwu 2012-06-07 10:00:26 -07:00
Landry Breuil
9a4bda6314 Bug 758849 - UPower isn't linux-only, give it a chance to build on BSDs at least. Add a section taking them into account. r=mounir 2012-05-29 10:57:15 +02:00
Landry Breuil
b3d4202738 Bug 712910 - Use stdint types in sandbox/PHal.ipdl too, fixes build on OpenBSD - r=Ms2ger 2012-05-26 09:33:51 -04:00
Ms2ger
6f9dcfb48d Merge m-c to m-i. 2012-05-25 11:15:32 +02:00
Ms2ger
1d02a1ece1 Bug 712910 - Use stdint types in HAL; r=cjones 2012-05-25 09:18:30 +02:00
Cervantes Yu
598e43c08f Bug 758096: don't use NS_INLINE_DECL_REFCOUNTING() for classes to be passed between threads. r=mwu 2012-05-24 17:09:05 +08:00
Cervantes Yu
f60da1592b Bug 758097: fix false warnings in debug build when reading switch uevent. r=mwu 2012-05-25 15:56:03 +08:00
Dave Hylands
c750adf513 Bug 737153 - Enable mounting storage through USB from a host machine - Add the AutoMounter, sr=cjones r=qDot 2012-05-24 21:03:34 -07:00
Cervantes Yu
07ca788442 Bug 755546: fix incorrect deletion of the sensor observer list in unregistration of one observer. r=cjones 2012-05-21 18:12:03 +08:00
Gervase Markham
ca171eec44 Bug 716478 - update licence to MPL 2. 2012-05-21 12:12:37 +01:00
Michael Wu
4601def2a9 Bug 755142 - Use ssize_t to store length of the sensor list, patch by an anonymous silicon vendor contributor, r=mwu 2012-05-16 14:52:00 -04:00
Kartikaya Gupta
5745519755 Bug 757025 - Guard against a null mObservers which is possible due to a race condition on some platforms. r=cjones 2012-05-24 13:53:40 -04:00
Michael Wu
1cdc9b4913 Bug 753521 - Use libhardware_legacy to turn off screen, r=jlebar 2012-05-09 14:30:22 -07:00
Etienne Segonzac
7b3e65e346 Bug 752683 - Always broadcasting the sensor events. r=dougt 2012-05-09 13:35:14 -07:00
Cervantes Yu
911b96e029 Bug 743638: Implement orientation API backend in gonk. r=mwu 2012-04-20 19:43:25 +08:00
Chris Jones
8f83158bec Bug 745145, part 4: Rename some things. r=mounir
--HG--
rename : hal/fallback/FallbackScreenOrientation.cpp => hal/fallback/FallbackScreenConfiguration.cpp
2012-05-08 14:36:07 -07:00
Chris Jones
262dbf3946 Bug 745145, part 2: Implement the ScreenConfiguration hal for gonk. r=mounir 2012-05-08 14:36:07 -07:00
Chris Jones
90472db691 Bug 745145, part 1: Generalize ScreenOrientation into ScreenConfiguration, and add screen rect and color+pixel depth to it. r=mounir 2012-05-08 14:36:07 -07:00
Steven Lee
313b018885 Bug 751423 - Wait for IO thread to finish setup. r=cjones 2012-05-04 15:16:27 +08:00
Doug Turner
68e34b4226 Bug 738465 - implement device light sensor. r=smaug 2012-05-02 09:43:45 -07:00
Doug Turner
63408865d2 Bug 738131 - implement device proximity. r=smaug
* * *
Bug 738131 - implement device proximity. gonk implementation. r=mwu
2012-05-02 09:43:45 -07:00
Mounir Lamouri
61c6e1a887 Bug 749645 - Use fallback files in hal/ when a backend isn't implemneted instead of having randomly defined methods. r=cjones
--HG--
rename : hal/fallback/ScreenOrientationFallback.cpp => hal/fallback/FallbackScreenOrientation.cpp
rename : hal/linux/Power.cpp => hal/linux/LinuxPower.cpp
2012-05-03 12:05:32 +02:00
Makoto Kato
12a5652bff Bug 625664 - accelerometer support using Windows 7 Sensor API. r=dougt 2012-05-01 12:04:30 +09:00
Steven Lee
2add4164ca Bug 736939 - Audio routing support. r=cjones, a=b2g-only 2012-04-22 14:09:22 -04:00
Kyle Machulis
1a6ecaa4e5 Bug 747545: Uevent Poller causes compile error when built debug due to ScopedClose member change - r=mwu a=b2g-only 2012-04-20 18:43:25 -07:00
Michael Wu
b963d37feb Bug 746728 - Add sensor index fallback for qemu, r=gal a=b2g-only 2012-04-18 17:18:08 -04:00
Kan-Ru Chen
c0b3125379 Bug 739913 - Add cpuSleepAllowed attribute to mozPower. r=cjones 2012-04-16 18:35:33 -04:00
Cervantes Yu
841f333fa1 Bug 742226 - Refactor battery updater using uevent poller. r=cjones 2012-04-11 15:59:00 +08:00
Cervantes Yu
e49802fb36 Bug 742226 - Create a uevent poller implementation. r=cjones 2012-04-13 12:02:33 +08:00
Ryan VanderMeulen
27a4e0dcb6 Back out entire dd28759eba7b push (bug 739913 and bug 742226) due to OSX 10.7 and b2g bustage. r=shouldausedtry 2012-04-12 20:00:57 -04:00
Cervantes Yu
d88e3e5f1e Bug 742226 - Refactor battery updater using the uevent poller. r=cjones 2012-04-11 15:59:00 +08:00
Cervantes Yu
2eb2f392bc Bug 742226 - Add a uevent poller implementation. r=cjones 2012-04-05 15:49:28 +08:00
Kan-Ru Chen
0bcf5a8211 Bug 739913 - Use kernel wake lock when the "cpu" topic is locked. r=cjones 2012-04-12 19:24:20 -04:00
Mounir Lamouri
15a94acd89 Bug 740190 - Screen Orientation API: implement locking in Android. r=dougt 2012-03-29 23:31:12 -07:00
Mounir Lamouri
e07e2adfa7 Bug 740188 - Screen Orientation API locking (1/3): DOM/HAL boilerplate. r=smaug sr=sicking 2012-03-29 12:43:16 -07:00
Steven Lee
19fa741c05 Bug 734869 - Fix hang when shutting down sensors. r=mwu 2012-03-26 09:59:02 +02:00
Doug Turner
b46b142894 Bug 738102 - devicemotion causes shutdown crash. r=jdm 2012-03-21 22:27:51 -07:00
Doug Turner
c78413b635 Bug 737462 - nsDeviceMotion leaks hal observers. r=mwu 2012-03-20 23:36:17 -07:00
Doug Turner
fab1546828 Bug 735330 - move device motion from dom/system to hal. gonk cleanup. r=jdm 2012-03-20 23:36:17 -07:00
Doug Turner
1707159de2 Bug 735330 - move device motion from dom/system to hal. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. cocoa bits. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. window/qt/linux bits. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. move accuracy into sensor data.  support compassneedscalibration. r=jdm

--HG--
rename : dom/system/cocoa/smslib.h => hal/cocoa/smslib.h
rename : dom/system/cocoa/smslib.mm => hal/cocoa/smslib.mm
2012-03-20 23:36:17 -07:00
Matt Brubeck
65e0765863 Back out bug 735330, bug 737462, bug 734854 because they broke XUL Fennec
--HG--
rename : hal/cocoa/smslib.h => dom/system/cocoa/smslib.h
rename : hal/cocoa/smslib.mm => dom/system/cocoa/smslib.mm
2012-03-20 16:59:24 -07:00
Doug Turner
20a9ae5e15 Bug 737462 - nsDeviceMotion leaks hal observers. r=mwu 2012-03-20 14:50:55 -07:00
Doug Turner
f9ae7a37f3 Bug 735330 - move device motion from dom/system to hal. gonk cleanup. r=jdm 2012-03-20 14:46:37 -07:00
Doug Turner
72f04d8a25 Bug 735330 - move device motion from dom/system to hal. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. cocoa bits. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. window/qt/linux bits. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. move accuracy into sensor data.  support compassneedscalibration. r=jdm

--HG--
rename : dom/system/cocoa/smslib.h => hal/cocoa/smslib.h
rename : dom/system/cocoa/smslib.mm => hal/cocoa/smslib.mm
2012-03-20 14:46:14 -07:00
Takanori MATSUURA
5ba43136ae Bug 736836 - Fix include so that hal/sandbox/PHal.ipdl can build with system NSPR. r=cjones 2012-03-20 17:21:56 -04:00
Mounir Lamouri
7061af5d83 Bug 720795 - Screen Orientation API reading and event implementation in Android. r=dougt 2012-03-20 14:09:45 +01:00
Mounir Lamouri
e1a1b3e2af Bug 735778 - Call MOZ_ASSERT if RemoveObserver is called with an observer that is not present. r=jlebar 2012-03-19 16:49:39 +01:00
Mounir Lamouri
9dc7a97d56 Bug 720794 - Part 1 (HAL) - Implement reading and event parts of Screen Orientation API. r=cjones 2012-03-13 17:42:46 +01:00
Mounir Lamouri
9e710093e5 Bug 725951 - Don't abort if mObservers is null when removing an observer from ObserversManager. r=jlebar 2012-03-14 19:18:26 +01:00
Mark Finkle
c5c1e891ea Backout 7e28d1a2c648, 330b210f503d, 2421d39e0ab3, aa978ffa44bc, 38a71ae7e06d, b94319584a7a, 7e8278f5e814, 0b4e3c7608ab, 329c07609ca8, 0d61a0d8dba4, Due to Ts regression on Android 2012-03-17 21:51:39 -04:00
Mounir Lamouri
ac0d9d477a Bug 735778 - Call MOZ_ASSERT if RemoveObserver is called with an observer that is not present. r=jlebar 2012-03-16 19:32:11 +01:00
Mounir Lamouri
3be7d6c979 Bug 720795 - Screen Orientation API reading and event implementation in Android. r=dougt 2012-03-16 19:43:10 +01:00
Mounir Lamouri
d69485a4f2 Bug 720794 - Part 1 (HAL) - Implement reading and event parts of Screen Orientation API. r=cjones 2012-03-13 17:42:46 +01:00
Mounir Lamouri
924b98f40b Bug 725951 - Don't abort if mObservers is null when removing an observer from ObserversManager. r=jlebar 2012-03-14 19:18:26 +01:00
Doug Turner
2274638595 Bug 734324 - implement device motion - rotation rate and acceleration. r=jdm 2012-03-13 16:57:51 -07:00
Ed Morley
12222d2d31 Backout 8b74d5ae78c3 & c619bbb2951f (bug 734391), 772c994fa869 (bug 734324), fd23ff0f9dd1 (bug 734325), d1e037a9390e (bug 733653), 3a7bf79b5b2d (bug 733650) & 9d9392fce538 (bug 733652) for OS X M1 & M3 orange 2012-03-13 22:29:29 +00:00
Doug Turner
95c2676d58 Bug 734324 - implement device motion - rotation rate and acceleration. r=jdm 2012-03-13 10:00:02 -07:00
Mounir Lamouri
11d811a229 Bug 733696 - Hal's CachingObservers shouldn't cache when GetCurrentInformation is called. r=jlebar 2012-03-07 19:26:38 +01:00
Fabrice Desré
e063b8cf33 Bug 730363 - startup slowdown waiting for batteryinfo [r=cjones] 2012-03-07 08:27:09 -08:00
Rafael Ávila de Espíndola
20d2a36ada Bug 733721 - Fix lookup into dependent base class. r=jlebar.
--HG--
extra : rebase_source : be77ad9f7b833f32c8b6a0efe389836abc758bd4
2012-03-07 12:44:05 -03:00
Kan-Ru Chen
255811e424 Bug 697132 - Implement wakelock interfaces. r=jlebar 2012-03-07 12:03:25 +01:00
Richard Newman
85840c2035 Merge last win pgo-green changeset from m-i to m-c. 2012-02-23 18:35:17 -08:00
Masatoshi Kimura
28f2776f50 Bug 699247 - Remove Win2K related code. r=jimm, sr=neil 2012-02-23 08:53:55 -06:00
Mark Capella
0af24742c6 Bug 721496 - Remove MOZ_WINSDK_TARGETVER ifdefs for pre-Windows 7 SDKs. r=jimm 2012-02-23 01:33:19 +01:00
Vincent Chang
45f42c66fc Bug 717150: Support adjust system clock and set timezone APIs in hal layer r=cjones. 2012-02-17 02:44:00 -08:00
Chris Jones
e8ddc60853 Bug 722953 - "Cause hardware buttons to illuminate when button is pressed" [r=gal] 2012-02-14 19:24:00 -08:00
Fabrice Desré
e44917de0e Bug 727287 - Battery support for akami devices [r=mounir] 2012-02-16 14:40:43 -08:00
Ben Francis
c44c953812 Bug 726612 - Gonk Battery API backend doesn't mark the device as charging when plugged to AC. r=mounir 2012-02-15 13:10:15 -05:00
Ms2ger
b5ab39ac78 Bug 712378 followup - Fix incorrect license headers; r=sparky 2012-02-10 11:04:44 +01:00
Jim Straus
4994f785ee Bug 712378: Add an interface to control lights, and use it for the screen backlight on Gonk. r=cjones 2012-02-01 22:09:00 -08:00
Steven Lee
53515fa787 Bug 714413 - Sensor support for gonk [r=cjones] 2012-02-05 18:41:15 -08:00
Sinker Li
ebbf06da6a Bug 697641, part 3: Make Sensor API available for Sandbox. r=cjones
Add Sensor API to PHal protocol that Sandbox can access sensors.
2012-02-05 19:51:06 +00:00
Sinker Li
d65d8e1017 Bug 697641, part 2: Add a hal API for sensor access. r=cjones
With this API, Gecko code can access sensors provied by system.  This
patch include an implementation for Android.
2012-02-05 19:51:06 +00:00
Ed Morley
b99d579b4b Backout 90f7f032757f, 6695904a4a70, 50e98f67df1b & d26e8631514c (bug 697641) for native Android failures and 20289eb83e51 (bug 712378) because it conflicted with the backout CLOSED TREE 2012-02-02 10:09:40 +00:00
Jim Straus
dab257b9cd Bug 712378: Add an interface to control lights, and use it for the screen backlight on Gonk. r=cjones 2012-02-01 22:09:00 -08:00
Sinker Li
d66fd0a876 Bug 697641, part 3: Make Sensor API available for Sandbox. r=cjones
Add Sensor API to PHal protocol that Sandbox can access sensors.
2012-02-01 22:47:55 -08:00
Sinker Li
e2c13d2e36 Bug 697641, part 2: Add a hal API for sensor access. r=cjones
With this API, Gecko code can access sensors provied by system.  This
patch include an implementation for Android.
2012-02-01 22:47:53 -08:00
Kan-Ru Chen
2c4bd4541e Bug 709585 - Part 5, hal code for the Power API. r=cjones
--HG--
extra : rebase_source : 49c8cb29be617293eb9143b3e3c760229b37943c
2012-01-31 01:08:00 -05:00
Scott Johnson
2e97d9bcda Backout 6a4c4cb828a8 for bustage on windows. 2012-01-30 18:47:43 -06:00
Kan-Ru Chen
b6bf636f26 Bug 709585 - Part 5/6, hal code for the Power API. r=cjones
--HG--
extra : rebase_source : 689315521a72444c8a0fc92efe128d5bf3fbbada
2012-01-30 17:02:51 -06:00
Mounir Lamouri
f80b14d4ee Bug 719632 - Add Network API fallback methods to the hal's gonk backend. r=cjones 2012-01-22 08:43:38 +01:00
Mounir Lamouri
23ead139c9 Bug 713687 - Part 4 - Network API Android backend: use enable/disable notifications to prevent listening when not needed. r=dougt 2012-01-16 15:01:07 +01:00
Mounir Lamouri
e6b1246ce3 Bug 713687 - Part 1 - Network API Android backend: get current information. r=dougt 2012-01-16 14:44:07 +01:00
Mounir Lamouri
439fd5f9cf Bug 677166 - Part 6 - Add NetworkInformation handling into hal. r=jlebar 2012-01-16 14:39:57 +01:00
Marco Bonardo
bc3801a4cd Backout 789f244f34f8, 1bea53f2d067, 577cba6021d2, 4191fe602648 (bug 697641) for win build bustage 2012-01-16 15:43:46 +01:00
Dão Gottwald
9493208711 Bug 697641, part 3: Make Sensor API available for Sandbox. r=cjones
Add Sensor API to PHal protocol that Sandbox can access sensors.
2012-01-16 14:37:49 +01:00
Sinker Li
690a89b92d Bug 697641, part 2: Add a hal API for sensor access. r=cjones
With this API, Gecko code can access sensors provied by system.  This
patch include an implementation for Android.
2012-01-16 14:37:44 +01:00
Chris Jones
765798d30a Bug 717155: Poke a different backlight controller. Stopgap for bug 712378. rs=jlebar 2012-01-11 11:56:23 -08:00
Philipp von Weitershausen
4c95e692e2 Bug 713149 - hal_impl has no method GetCurrentBatteryInformation. r=cjones 2011-12-24 06:03:55 +01:00
Justin Lebar
4d62c116a2 Bug 712665 - Fix GonkHal.cpp debug compile errors. r=mwu 2011-12-21 17:58:29 -08:00
Chris Jones
5e2599d529 Bug 712226 - Crash when fclose(NULL)'ing a battery-status FILE*, r=mwu 2011-12-21 17:58:29 -08:00
Justin Lebar
6bb5ccac61 Bug 694862 - Implement navigator.mozVibrate for Gonk, r=cjones 2011-12-21 17:58:29 -08:00
Michael Wu
03ed7088aa Land GonkHal.cpp - Bug 696042 r=cjones, Bug 702256 r=cjones,mounir, Bug 694862 r=cjones 2011-12-20 11:31:53 -08:00
Makoto Kato
6833455833 Bug 710178 - ASSERTION: Battery API: When charging and level at 1.0, remaining time should be 0. Please fix your backend. r=mounir 2011-12-19 12:23:13 +09:00
Mounir Lamouri
bcecb5e9cb Bug 709584 - Make Hal observer management a more generic. r=jlebar sr=cjones 2011-12-17 22:51:44 +01:00
Mounir Lamouri
2fd57888d7 Bug 710793 - Move hal's private methods outside of Hal.h. r=jlebar sr=cjones 2011-12-17 22:04:51 +01:00
Mounir Lamouri
94e6de41f3 Bug 710748 - Remove useless forward declaration in Hal.h. r=jlebar 2011-12-17 19:30:07 +01:00
Mounir Lamouri
1a54bc25bb Bug 710745 - Don't expose WindowIdentifier in Hal.h. r=jlebar sr=cjones 2011-12-17 22:04:26 +01:00
Justin Lebar
583f77dbbe Bug 679966, part 2: Add mozVibrator() for "playing" a vibration pattern. r=bz 2011-11-10 16:26:36 -05:00
Justin Lebar
26afae03b7 Bug 706958 - Add ClearOnShutdown() function which will clear a smart pointer on shutdown. r=bsmedberg 2011-12-15 10:51:11 -05:00
Andrew Quartey
faa8be8d82 Bug 706010 - Remove NS_SPECIALIZE_TEMPLATE and HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX; r=khuey a=cleanup/removal 2011-12-13 14:17:59 +00:00
Justin Lebar
8f39bf2e51 Bug 702256 - "[Gonk] Add DOM API for turning screen on/off and adjusting the screen's brightness" r=cjones,mounir 2011-12-05 01:07:00 +08:00
Marco Bonardo
d40c12a19c Backout 407fba8cbd5a (bug 702256) for build failure on Windows. 2011-12-05 13:48:59 +01:00
Justin Lebar
6a7d0a009c Bug 702256 - "[Gonk] Add DOM API for turning screen on/off and adjusting the screen's brightness" r=cjones,mounir
--HG--
extra : rebase_source : 6c1f1b49d911e749da524266695e2f05d52900b2
2011-12-05 01:07:00 +08:00
Makoto Kato
6f82f76952 Bug 696049 - Battery API: Windows backend. r=mounir,jimm 2011-12-05 19:34:27 +09:00
Mounir Lamouri
ec67d02a29 Bug 707085 - Fix Battery API default values. r=sicking 2011-12-04 21:00:21 +08:00
Mounir Lamouri
e890c12c5b Bug 705084 - Part B - Use kDefaultRemainingTime instead of kUnknownRemaining time when appropriate in UPower backend. r=cjones 2011-12-01 11:50:58 +01:00
Michael Wu
fec7797d9c Bug 703307 - Fix build/crash in gonk, r=cjones 2011-11-22 11:51:51 -08:00
Mounir Lamouri
a526817e17 Bug 703610 - Return level=1.0 when the battery is full (Battery API UPower backend). r=cjones 2011-11-22 10:36:22 +01:00
Mounir Lamouri
f431f55925 Bug 700262 - Add remainingTime support to upower backend. r=cjones 2011-11-09 10:00:01 +01:00
Mounir Lamouri
2193d385c3 Bug 700261 - Add .chargingTime/.dischargingTime support to hal code. r=cjones 2011-11-09 09:58:59 +01:00
Mounir Lamouri
49b08db14f Bug 699742 - (3/4) battery.level should be a double (upower backend). r=cjones 2011-11-09 09:56:22 +01:00
Mounir Lamouri
878fded797 Bug 699742 - (2/4) battery.level should be a double (hal part). r=cjones 2011-11-09 15:15:28 +01:00
Chris Jones
ab87d668dd Bug 679966, part 1: Add vibrator support for android. r=blassey,cjones 2011-09-30 00:00:48 -07:00
Mounir Lamouri
e758b91d67 Bug 696041 - Battery API backend for linux with upower. r=karlt,cjones sr=roc 2011-11-03 11:33:31 +01:00
Mounir Lamouri
2545c63c8e Bug 696038 - (2/3) Boilerplate code to communicate between hal and Android Java code. r=cjones 2011-11-02 16:35:11 +01:00
Mounir Lamouri
9df2ac0240 Bug 696038 - (1/3) Add an Android implementation for hal. r=cjones 2011-11-02 16:28:26 +01:00
Mounir Lamouri
0da0fba3a7 Bug 678694 - (6/7) hal code for the Battery API. r=cjones 2011-11-02 16:14:01 +01:00
Justin Lebar
1a8ce6c37c No bug - Fix vim modelines in hal. rs=biesi DONTBUILD 2011-10-20 17:38:39 -04:00
Chris Jones
130e939216 Bug 690670, parts 1 and 2: Add a hal/ directory in which we can add device-interaction code, and build goop thereto. r=khuey sr=roc
--HG--
extra : rebase_source : bf3dc09f49d010ac4422150fc5300a41080af858
2011-10-05 15:15:45 -07:00