mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 10:44:56 +00:00
Merge b2g-inbound to m-c a=merge
This commit is contained in:
Wes Kocher
commit
6778c46ae7
42
b2g/config/dolphin-512/config.json
Normal file
42
b2g/config/dolphin-512/config.json
Normal file
@ -0,0 +1,42 @@
|
||||
{
|
||||
"config_version": 2,
|
||||
"mock_target": "mozilla-centos6-x86_64",
|
||||
"mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel", "glibc-devel.i686", "libstdc++.i686", "zlib-devel.i686", "ncurses-devel.i686", "libX11-devel.i686", "mesa-libGL-devel.i686", "mesa-libGL-devel", "libX11-devel", "git", "libxml2", "bc"],
|
||||
"mock_files": [["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"]],
|
||||
"build_targets": ["kernelheader", ""],
|
||||
"upload_files": [
|
||||
"{objdir}/dist/b2g-*.crashreporter-symbols.zip",
|
||||
"{objdir}/dist/b2g-*.tar.gz",
|
||||
"{workdir}/sources.xml"
|
||||
],
|
||||
"public_upload_files": [
|
||||
"{objdir}/dist/b2g-*.crashreporter-symbols.zip",
|
||||
"{objdir}/dist/b2g-*.tar.gz",
|
||||
"{workdir}/sources.xml"
|
||||
],
|
||||
"zip_files": [
|
||||
["{workdir}/out/target/product/scx15_sp7715ea/*.img", "out/target/product/scx15_sp7715ea/"],
|
||||
"{workdir}/flash.sh",
|
||||
"{workdir}/load-config.sh",
|
||||
"{workdir}/.config",
|
||||
"{workdir}/sources.xml",
|
||||
"{workdir}/profile.sh",
|
||||
["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"],
|
||||
["{workdir}/scripts/profile-symbolicate.py", "scripts/"],
|
||||
["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"]
|
||||
],
|
||||
"env": {
|
||||
"VARIANT": "user",
|
||||
"MOZILLA_OFFICIAL": "1"
|
||||
},
|
||||
"b2g_manifest": "dolphin-512.xml",
|
||||
"b2g_manifest_intree": true,
|
||||
"additional_source_tarballs": [],
|
||||
"gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
|
||||
"gaia": {
|
||||
"l10n": {
|
||||
"vcs": "hgtool",
|
||||
"root": "https://hg.mozilla.org/gaia-l10n"
|
||||
}
|
||||
}
|
||||
}
|
||||
145
b2g/config/dolphin-512/sources.xml
Normal file
145
b2g/config/dolphin-512/sources.xml
Normal file
@ -0,0 +1,145 @@
|
||||
<?xml version="1.0" ?><manifest>
|
||||
<!--original fetch url was https://android.googlesource.com/-->
|
||||
<remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
|
||||
<!--original fetch url was git://github.com/mozilla-b2g/-->
|
||||
<remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
|
||||
<!--original fetch url was git://github.com/mozilla/-->
|
||||
<remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
|
||||
<!--original fetch url was git://github.com/apitrace/-->
|
||||
<remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
|
||||
<!--original fetch url was git://codeaurora.org/-->
|
||||
<remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
|
||||
<!--original fetch url was https://git.mozilla.org/releases-->
|
||||
<remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
|
||||
<!-- B2G specific things. -->
|
||||
<project name="platform_build" path="build" remote="b2g" revision="e0c735ec89df011ea7dd435087a9045ecff9ff9e">
|
||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="9946a490a9264b42e65385d703b28fa055ab2d42"/>
|
||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="049c281ad212bf528b2af8fc246b0dd0c9f97415"/>
|
||||
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
||||
<project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
|
||||
<project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
|
||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="34ea6163f9f0e0122fb0bb03607eccdca31ced7a"/>
|
||||
<!-- Stock Android things -->
|
||||
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="95bb5b66b3ec5769c3de8d3f25d681787418e7d2"/>
|
||||
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="ebdad82e61c16772f6cd47e9f11936bf6ebe9aa0"/>
|
||||
<project groups="linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" revision="8b880805d454664b3eed11d0f053cdeafa1ff06e"/>
|
||||
<project groups="linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" revision="a1e239a0bb5cd1d69680bf1075883aa9a7bf2429"/>
|
||||
<project groups="linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7" path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7" revision="c7931763d41be602407ed9d71e2c0292c6597e00"/>
|
||||
<project groups="linux,x86" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="83760d213fb3bec7b4117d266fcfbf6fe2ba14ab"/>
|
||||
<project name="device/common" path="device/common" revision="6a2995683de147791e516aae2ccb31fdfbe2ad30"/>
|
||||
<project name="device/sample" path="device/sample" revision="1a3d8efa0ad32ec8f145367a3cf0f54b97385c3c"/>
|
||||
<project name="platform/abi/cpp" path="abi/cpp" revision="18f1b5e28734183ff8073fe86dc46bc4ebba8a59"/>
|
||||
<project name="platform/bionic" path="bionic" revision="86b1f589c313422a7da1812512b9ec8d1cf9ba3c"/>
|
||||
<project name="platform/bootable/recovery" path="bootable/recovery" revision="75a2463ff719f242759de5c6c7555473dab05b68"/>
|
||||
<project name="platform/external/aac" path="external/aac" revision="fa3eba16446cc8f2f5e2dfc20d86a49dbd37299e"/>
|
||||
<project name="platform/external/bison" path="external/bison" revision="c2418b886165add7f5a31fc5609f0ce2d004a90e"/>
|
||||
<project name="platform/external/bluetooth/bluedroid" path="external/bluetooth/bluedroid" revision="c8e99ca7e11c00f8124196fe1726a15e6e976587"/>
|
||||
<project name="platform/external/bsdiff" path="external/bsdiff" revision="23e322ab19fb7d74c2c37e40ce364d9f709bdcee"/>
|
||||
<project name="platform/external/bzip2" path="external/bzip2" revision="1cb636bd8e9e5cdfd5d5b2909a122f6e80db62de"/>
|
||||
<project name="platform/external/checkpolicy" path="external/checkpolicy" revision="0d73ef7049feee794f14cf1af88d05dae8139914"/>
|
||||
<project name="platform/external/dhcpcd" path="external/dhcpcd" revision="84b7252b0a9d0edc9a1db1e0c518771d26b23058"/>
|
||||
<project name="platform/external/dnsmasq" path="external/dnsmasq" revision="41d356427a632f5336384bfa45c8420ffc274f66"/>
|
||||
<project name="platform/external/dropbear" path="external/dropbear" revision="a34ddbe3819bc465968f3676c734b405e655f8b7"/>
|
||||
<project name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="47478a2944a2a17c7fdebe9d92573db92013125c"/>
|
||||
<project name="platform/external/elfutils" path="external/elfutils" revision="b23b2dfb354b3ccf5d1c5d39815f02e7048cf516"/>
|
||||
<project name="platform/external/expat" path="external/expat" revision="0af0cb3bc7519e567bd9daff3dcd315ab0134a99"/>
|
||||
<project name="platform/external/fdlibm" path="external/fdlibm" revision="0da5f683c9ddc9442af3b389b4220e91ccffb320"/>
|
||||
<project name="platform/external/flac" path="external/flac" revision="ab37b6247df0e8c4ec0ccaa870e667f62c74975b"/>
|
||||
<project name="platform/external/freetype" path="external/freetype" revision="899c67b6cfcd2010784fbf08c5415af16c526e0c"/>
|
||||
<project name="platform/external/gcc-demangle" path="external/gcc-demangle" revision="9241386b62c353302c2f9eccda0672685b252b4d"/>
|
||||
<project name="platform/external/genext2fs" path="external/genext2fs" revision="e11a9c7fe6f1cef99aad2f25afaea37b72fe9f93"/>
|
||||
<project name="platform/external/giflib" path="external/giflib" revision="9aef3ea079a57c98a9207f8c3b95a5dc08ee74b5"/>
|
||||
<project name="platform/external/gtest" path="external/gtest" revision="0f1ce3dd0b880b6ae0cf7f5413702b8ef542efb2"/>
|
||||
<project name="platform/external/harfbuzz" path="external/harfbuzz" revision="858f2d28ac741ef139f74bdbdbcefa7560f17c91"/>
|
||||
<project name="platform/external/harfbuzz_ng" path="external/harfbuzz_ng" revision="3309edccdbc2a92eb03a285abb27c1c1c4a88e43"/>
|
||||
<project name="platform/external/iproute2" path="external/iproute2" revision="157d428913c3d738be481f12e8cbf9267b3b2862"/>
|
||||
<project name="platform/external/ipsec-tools" path="external/ipsec-tools" revision="f4cb1ee4b00abbfb6f968dc25818c23b4b47e584"/>
|
||||
<project name="platform/external/iptables" path="external/iptables" revision="93e814c9b08136846335ce463192d90ba59766bb"/>
|
||||
<project name="platform/external/jack" path="external/jack" revision="5ceb2025ac5d25ed48183ac2d3dac4691fe761fb"/>
|
||||
<project name="platform/external/jhead" path="external/jhead" revision="31b17e69a87e4caa50f9c6b1a47c84ef75f79d83"/>
|
||||
<project name="platform/external/jpeg" path="external/jpeg" revision="68f6f73d3157cc0481826e03d0fae9586217a300"/>
|
||||
<project name="platform/external/junit" path="external/junit" revision="3abf41974d8aae44b3bbd15d83487894253d287d"/>
|
||||
<project name="platform/external/libgsm" path="external/libgsm" revision="50761abed8f4734970874165b386cfd4d9599db4"/>
|
||||
<project name="platform/external/liblzf" path="external/liblzf" revision="6946aa575b0949d045722794850896099d937cbb"/>
|
||||
<project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="9e987ccb716624d658f98abc7db2097e11e3d8ed"/>
|
||||
<project name="platform/external/libnl-headers" path="external/libnl-headers" revision="6ccf7349d61f73ac26a0675d735d903ab919c658"/>
|
||||
<project name="platform/external/libogg" path="external/libogg" revision="ec0b24fb1468abe37be4164a6feb16568e036bde"/>
|
||||
<project name="platform/external/libpcap" path="external/libpcap" revision="3a7bce5dda6a8db92c9248846d0255e68c3a5b2a"/>
|
||||
<project name="platform/external/libpng" path="external/libpng" revision="b5e7fb4c103b3898cb78e9f7615cf7893626a5e9"/>
|
||||
<project name="platform/external/libselinux" path="external/libselinux" revision="1e2cf2c4a2d15a9b1ca2d353b99fb6884413ffe1"/>
|
||||
<project name="platform/external/libsepol" path="external/libsepol" revision="8fd7c65a336d45d5225f32363a9f26c1e3e60c3c"/>
|
||||
<project name="platform/external/libvpx" path="external/libvpx" revision="5e563eddf3e143a4b670766b49f676ce39023322"/>
|
||||
<project name="platform/external/mdnsresponder" path="external/mdnsresponder" revision="c46f53f5e072f23051c4eedef730386f7634dc11"/>
|
||||
<project name="platform/external/mksh" path="external/mksh" revision="f8c396c4d446a038358106a301b329607a04633d"/>
|
||||
<project name="platform/external/netcat" path="external/netcat" revision="444644cfa9a2f3002863caa168fb2d6b34dfd1e8"/>
|
||||
<project name="platform/external/netperf" path="external/netperf" revision="58ecd3b7c76263900e38921360e334a416aec362"/>
|
||||
<project name="platform/external/openssl" path="external/openssl" revision="bb8428f762b3632f493572c4f73957e1281ade79"/>
|
||||
<project name="platform/external/protobuf" path="external/protobuf" revision="48ee66d295979372ed0234cefda42385daae8312"/>
|
||||
<project name="platform/external/safe-iop" path="external/safe-iop" revision="aa0725fb1da35e47676b6da30009322eb5ed59be"/>
|
||||
<project name="platform/external/scrypt" path="external/scrypt" revision="eb05b73c3bba21fff55529813109de4bad5ddbd1"/>
|
||||
<project name="platform/external/sepolicy" path="external/sepolicy" revision="f3525622103090156a6bbd9a8609be8b009d223f"/>
|
||||
<project name="platform/external/sfntly" path="external/sfntly" revision="30d4e1f3d81ad9f7a1aa14ce6d2ceb5df56c15cd"/>
|
||||
<project name="platform/external/skia" path="external/skia" revision="97c714a01e32e6aee7faf9c57fbbd4d95b41d353"/>
|
||||
<project name="platform/external/sonivox" path="external/sonivox" revision="2dbbd3bac0f0e819d196a80cc7855054148ef8b6"/>
|
||||
<project name="platform/external/speex" path="external/speex" revision="fb7db5853ffb841a4d32fea8b5c3a43e6b875cae"/>
|
||||
<project name="platform/external/sqlite" path="external/sqlite" revision="ac0e0d5f866fbce0ebf00d0ddd615464849aa83b"/>
|
||||
<project name="platform/external/stlport" path="external/stlport" revision="628e14d37c5b239839a466e81c74bf66255b770b"/>
|
||||
<project name="platform/external/strace" path="external/strace" revision="1a4e05d53dec658a061acb9869cb1eb1342cd09d"/>
|
||||
<project name="platform/external/svox" path="external/svox" revision="838228cc17b5798e51bc20d06e54dbd781e441db"/>
|
||||
<project name="platform/external/tagsoup" path="external/tagsoup" revision="68c2ec9e0acdb3214b7fb91dbab8c9fab8736817"/>
|
||||
<project name="platform/external/tcpdump" path="external/tcpdump" revision="532b8f38c144da9a298260a5d8978ab9e8e3856c"/>
|
||||
<project name="platform/external/tinyalsa" path="external/tinyalsa" revision="aa08b9c35638a32de0444a940cf47708e4ba0eda"/>
|
||||
<project name="platform/external/tinycompress" path="external/tinycompress" revision="a85e245a09c028d36cbf04f233be10bc583691f5"/>
|
||||
<project name="platform/external/tinyxml" path="external/tinyxml" revision="494e448824844d866e805831d1d5f5acb654065c"/>
|
||||
<project name="platform/external/tinyxml2" path="external/tinyxml2" revision="c74b546f5af36968ffa56d7fd4529f4273b96f48"/>
|
||||
<project name="platform/external/tremolo" path="external/tremolo" revision="0499204aa97d3e2978ee77d869dd033acb2196e2"/>
|
||||
<project name="platform/external/webp" path="external/webp" revision="513e97bd307573e2adc776eb5368bd129aceaa4a"/>
|
||||
<project name="platform/external/webrtc" path="external/webrtc" revision="446452f84e9cc4c75d8e80f6f05e24793397a19d"/>
|
||||
<project name="platform/external/yaffs2" path="external/yaffs2" revision="a2cff2275e1b501ff478b03757d6e4f05fddc2db"/>
|
||||
<project name="platform/external/zlib" path="external/zlib" revision="a5c7131da47c991585a6c6ac0c063b6d7d56e3fc"/>
|
||||
<project name="platform/frameworks/base" path="frameworks/base" revision="2d12cb68a6c680e1ef50c6fbd19f782f67aec9de"/>
|
||||
<project name="platform/frameworks/native" path="frameworks/native" revision="b6018ccb81af66e0523a4bfdc45f0bd2ab472b55"/>
|
||||
<project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" revision="dbbe673145107e99883f62bafd70c5f43f11065c"/>
|
||||
<project name="platform/frameworks/wilhelm" path="frameworks/wilhelm" revision="aac6c4bb59a6577c97cbda68699829b507b7490d"/>
|
||||
<project name="platform/hardware/libhardware" path="hardware/libhardware" revision="fbeca55f4695dd07c0291213403533b8fbca4885"/>
|
||||
<project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="a8449b1de00c313a4ca90d55af44c9b706b17926"/>
|
||||
<project name="platform/libcore" path="libcore" revision="e195beab082c09217318fc19250caeaf4c1bd800"/>
|
||||
<project name="platform/libnativehelper" path="libnativehelper" revision="feeb36c2bd4adfe285f98f5de92e0f3771b2c115"/>
|
||||
<project name="platform/ndk" path="ndk" revision="e58ef003be4306bb53a8c11331146f39e4eab31f"/>
|
||||
<project name="platform_prebuilts_misc" path="prebuilts/misc" remote="b2g" revision="0e7c060db684b409616fe67ea433ef19f5634c60"/>
|
||||
<project name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="c792f0bd9fff7aea2887c60bbb3a9bbdb534ffa3"/>
|
||||
<project name="platform_prebuilts_qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="f7d9bf71cf6693474f3f2a81a4ba62c0fc5646aa"/>
|
||||
<project name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="cfcef469537869947abb9aa1d656774cc2678d4c"/>
|
||||
<project name="platform/prebuilts/tools" path="prebuilts/tools" revision="5a48c04c4bb5f079bc757e29864a42427378e051"/>
|
||||
<project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="288db53ad77084bd44791add5e3a4c266a6e9c60"/>
|
||||
<project name="platform/system/extras" path="system/extras" revision="10e78a05252b3de785f88c2d0b9ea8a428009c50"/>
|
||||
<project name="platform/system/media" path="system/media" revision="7ff72c2ea2496fa50b5e8a915e56e901c3ccd240"/>
|
||||
<project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="fe95bc6f83af5c18a73aa86c96e7fa7f79b91477"/>
|
||||
<project name="platform/system/netd" path="system/netd" revision="3ae56364946d4a5bf5a5f83f12f9a45a30398e33"/>
|
||||
<project name="platform/system/security" path="system/security" revision="ee8068b9e7bfb2770635062fc9c2035be2142bd8"/>
|
||||
<project name="platform/system/vold" path="system/vold" revision="2e43efe1b30d0b98574d293059556aebd2f46454"/>
|
||||
<!--original fetch url was http://sprdsource.spreadtrum.com:8085/b2g/android-->
|
||||
<remote fetch="https://git.mozilla.org/external/sprd-aosp" name="sprd-aosp"/>
|
||||
<default remote="sprd-aosp" revision="sprdb2g_gonk4.4" sync-j="4"/>
|
||||
<!-- Stock Android things -->
|
||||
<project name="platform/external/icu4c" path="external/icu4c" revision="2bb01561780583cc37bc667f0ea79f48a122d8a2"/>
|
||||
<!-- dolphin specific things -->
|
||||
<project name="device/sprd" path="device/sprd" revision="b94ac10f073ed2503505e59f5097d4e286423037"/>
|
||||
<project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="4e58336019b5cbcfd134caf55b142236cf986618"/>
|
||||
<project name="platform/frameworks/av" path="frameworks/av" revision="4387fe988e5a1001f29ce05fcfda03ed2d32137b"/>
|
||||
<project name="platform/hardware/akm" path="hardware/akm" revision="6d3be412647b0eab0adff8a2768736cf4eb68039"/>
|
||||
<project groups="invensense" name="platform/hardware/invensense" path="hardware/invensense" revision="e6d9ab28b4f4e7684f6c07874ee819c9ea0002a2"/>
|
||||
<project name="platform/hardware/ril" path="hardware/ril" revision="865ce3b4a2ba0b3a31421ca671f4d6c5595f8690"/>
|
||||
<project name="kernel/common" path="kernel" revision="6c6f012cea17fb8b3263605737816cf6663432f1"/>
|
||||
<project name="platform/system/core" path="system/core" revision="53d584d4a4b4316e4de9ee5f210d662f89b44e7e"/>
|
||||
<project name="u-boot" path="u-boot" revision="5167e5eec5cb6b3147839da158637e6d953a4e4f"/>
|
||||
<project name="vendor/sprd/gps" path="vendor/sprd/gps" revision="6974f8e771d4d8e910357a6739ab124768891e8f"/>
|
||||
<project name="vendor/sprd/open-source" path="vendor/sprd/open-source" revision="a6f913f0e114945d995680a6fe5cccb24c02b3c2"/>
|
||||
<project name="vendor/sprd/partner" path="vendor/sprd/partner" revision="8649c7145972251af11b0639997edfecabfc7c2e"/>
|
||||
<project name="vendor/sprd/proprietories" path="vendor/sprd/proprietories" revision="d2466593022f7078aaaf69026adf3367c2adb7bb"/>
|
||||
</manifest>
|
||||
@ -15,7 +15,7 @@
|
||||
<project name="platform_build" path="build" remote="b2g" revision="e06971db7acf7a35c32eb74d675a4e12e288e6be">
|
||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="966b3a7a13a7f0d5b86cbc9e64cb78d43ec7dba8"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="cba2f0bf49b882e0044c3cc583de8fcf83d2ffa4"/>
|
||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
|
||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
|
||||
@ -116,7 +116,7 @@
|
||||
<project name="platform_prebuilts_qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="f7d9bf71cf6693474f3f2a81a4ba62c0fc5646aa"/>
|
||||
<project name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="cfcef469537869947abb9aa1d656774cc2678d4c"/>
|
||||
<project name="platform/prebuilts/tools" path="prebuilts/tools" revision="5a48c04c4bb5f079bc757e29864a42427378e051"/>
|
||||
<project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="8a05fd72770a3b1fc23f3216a45318ad393fc4ca"/>
|
||||
<project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="d8040bc7850e326b297045ccbd51bfd7bf566a53"/>
|
||||
<project name="platform/system/extras" path="system/extras" revision="10e78a05252b3de785f88c2d0b9ea8a428009c50"/>
|
||||
<project name="platform/system/media" path="system/media" revision="7ff72c2ea2496fa50b5e8a915e56e901c3ccd240"/>
|
||||
<project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="fe95bc6f83af5c18a73aa86c96e7fa7f79b91477"/>
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="966b3a7a13a7f0d5b86cbc9e64cb78d43ec7dba8"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="cba2f0bf49b882e0044c3cc583de8fcf83d2ffa4"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
</project>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="966b3a7a13a7f0d5b86cbc9e64cb78d43ec7dba8"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="cba2f0bf49b882e0044c3cc583de8fcf83d2ffa4"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
|
||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="fe91ec3af5396edab45b15e546e21613785724b5"/>
|
||||
@ -118,7 +118,7 @@
|
||||
<project name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="842e33e43a55ea44833b9e23e4d180fa17c843af"/>
|
||||
<project name="platform/prebuilts/tools" path="prebuilts/tools" revision="5db24726f0f42124304195a6bdea129039eeeaeb"/>
|
||||
<project name="platform/system/bluetooth" path="system/bluetooth" revision="930ae098543881f47eac054677726ee4b998b2f8"/>
|
||||
<project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="8a05fd72770a3b1fc23f3216a45318ad393fc4ca"/>
|
||||
<project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="d8040bc7850e326b297045ccbd51bfd7bf566a53"/>
|
||||
<project name="platform_system_core" path="system/core" remote="b2g" revision="542d1f59dc331b472307e5bd043101d14d5a3a3e"/>
|
||||
<project name="platform/system/extras" path="system/extras" revision="18c1180e848e7ab8691940481f5c1c8d22c37b3e"/>
|
||||
<project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="fe95bc6f83af5c18a73aa86c96e7fa7f79b91477"/>
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
<project name="platform_build" path="build" remote="b2g" revision="e06971db7acf7a35c32eb74d675a4e12e288e6be">
|
||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="966b3a7a13a7f0d5b86cbc9e64cb78d43ec7dba8"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="cba2f0bf49b882e0044c3cc583de8fcf83d2ffa4"/>
|
||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
|
||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
|
||||
@ -116,7 +116,7 @@
|
||||
<project name="platform_prebuilts_qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="f7d9bf71cf6693474f3f2a81a4ba62c0fc5646aa"/>
|
||||
<project name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="b562b01c93de9578d5db537b6a602a38e1aaa0ce"/>
|
||||
<project name="platform/prebuilts/tools" path="prebuilts/tools" revision="387f03e815f57d536dd922706db1622bddba8d81"/>
|
||||
<project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="8a05fd72770a3b1fc23f3216a45318ad393fc4ca"/>
|
||||
<project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="d8040bc7850e326b297045ccbd51bfd7bf566a53"/>
|
||||
<project name="platform/system/extras" path="system/extras" revision="5356165f67f4a81c2ef28671c13697f1657590df"/>
|
||||
<project name="platform/system/media" path="system/media" revision="be0e2fe59a8043fa5200f75697df9220a99abe9d"/>
|
||||
<project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="fe95bc6f83af5c18a73aa86c96e7fa7f79b91477"/>
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="966b3a7a13a7f0d5b86cbc9e64cb78d43ec7dba8"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="cba2f0bf49b882e0044c3cc583de8fcf83d2ffa4"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
<project name="platform_build" path="build" remote="b2g" revision="e06971db7acf7a35c32eb74d675a4e12e288e6be">
|
||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="966b3a7a13a7f0d5b86cbc9e64cb78d43ec7dba8"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="cba2f0bf49b882e0044c3cc583de8fcf83d2ffa4"/>
|
||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
|
||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
|
||||
@ -111,7 +111,7 @@
|
||||
<project name="platform_prebuilts_qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="f7d9bf71cf6693474f3f2a81a4ba62c0fc5646aa"/>
|
||||
<project name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="69d524e80cdf3981006627c65ac85f3a871238a3"/>
|
||||
<project name="platform/prebuilts/tools" path="prebuilts/tools" revision="5a48c04c4bb5f079bc757e29864a42427378e051"/>
|
||||
<project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="8a05fd72770a3b1fc23f3216a45318ad393fc4ca"/>
|
||||
<project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="d8040bc7850e326b297045ccbd51bfd7bf566a53"/>
|
||||
<project name="platform/system/extras" path="system/extras" revision="576f57b6510de59c08568b53c0fb60588be8689e"/>
|
||||
<project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="fe95bc6f83af5c18a73aa86c96e7fa7f79b91477"/>
|
||||
<project name="platform/system/netd" path="system/netd" revision="a6531f7befb49b1c81bc0de7e51c5482b308e1c5"/>
|
||||
@ -133,6 +133,7 @@
|
||||
<project name="platform/external/bluetooth/bluedroid" path="external/bluetooth/bluedroid" revision="30b96dfca99cb384bf520a16b81f3aba56f09907"/>
|
||||
<project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="5b71e40213f650459e95d35b6f14af7e88d8ab62"/>
|
||||
<project name="platform_external_libnfc-nci" path="external/libnfc-nci" remote="t2m" revision="4186bdecb4dae911b39a8202252cc2310d91b0be"/>
|
||||
<project name="platform_external_libnfc-pn547" path="external/libnfc-pn547" remote="b2g" revision="5bb999b84b8adc14f6bea004d523ba258dea8188"/>
|
||||
<project name="platform/frameworks/av" path="frameworks/av" revision="65f5144987afff35a932262c0c5fad6ecce0c04a"/>
|
||||
<project name="platform/frameworks/base" path="frameworks/base" revision="da8e6bc53c8bc669da0bb627904d08aa293f2497"/>
|
||||
<project name="platform/frameworks/native" path="frameworks/native" revision="a46a9f1ac0ed5662d614c277cbb14eb3f332f365"/>
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
</project>
|
||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
|
||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="966b3a7a13a7f0d5b86cbc9e64cb78d43ec7dba8"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="cba2f0bf49b882e0044c3cc583de8fcf83d2ffa4"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
|
||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="fe91ec3af5396edab45b15e546e21613785724b5"/>
|
||||
@ -131,6 +131,7 @@
|
||||
<project name="platform/external/bluetooth/glib" path="external/bluetooth/glib" revision="dd925f76e4f149c3d5571b80e12f7e24bbe89c59"/>
|
||||
<project name="platform/external/dbus" path="external/dbus" revision="ea87119c843116340f5df1d94eaf8275e1055ae8"/>
|
||||
<project name="platform_external_libnfc-nci" path="external/libnfc-nci" remote="t2m" revision="4186bdecb4dae911b39a8202252cc2310d91b0be"/>
|
||||
<project name="platform_external_libnfc-pn547" path="external/libnfc-pn547" remote="b2g" revision="5bb999b84b8adc14f6bea004d523ba258dea8188"/>
|
||||
<project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="320b05a5761eb2a4816f7529c91ea49422979b55"/>
|
||||
<project name="platform/frameworks/av" path="frameworks/av" revision="0f7829661cd7125de9dc2c90eca2fa1dbc68dfbf"/>
|
||||
<project name="platform/frameworks/base" path="frameworks/base" revision="f9309b4463abd80e0876cd113c892e31d62113b1"/>
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{
|
||||
"git": {
|
||||
"git_revision": "966b3a7a13a7f0d5b86cbc9e64cb78d43ec7dba8",
|
||||
"git_revision": "cba2f0bf49b882e0044c3cc583de8fcf83d2ffa4",
|
||||
"remote": "https://git.mozilla.org/releases/gaia.git",
|
||||
"branch": ""
|
||||
},
|
||||
"revision": "9a9aef701b1c69e9fb76eb3cc629be10aecfa3f3",
|
||||
"revision": "23474274d441d400d43cdec6eaef41ff23443d80",
|
||||
"repo_path": "integration/gaia-central"
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="966b3a7a13a7f0d5b86cbc9e64cb78d43ec7dba8"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="cba2f0bf49b882e0044c3cc583de8fcf83d2ffa4"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
|
||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="966b3a7a13a7f0d5b86cbc9e64cb78d43ec7dba8"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="cba2f0bf49b882e0044c3cc583de8fcf83d2ffa4"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
</project>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="966b3a7a13a7f0d5b86cbc9e64cb78d43ec7dba8"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="cba2f0bf49b882e0044c3cc583de8fcf83d2ffa4"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
|
||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="fe91ec3af5396edab45b15e546e21613785724b5"/>
|
||||
@ -118,7 +118,7 @@
|
||||
<project name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="842e33e43a55ea44833b9e23e4d180fa17c843af"/>
|
||||
<project name="platform/prebuilts/tools" path="prebuilts/tools" revision="5db24726f0f42124304195a6bdea129039eeeaeb"/>
|
||||
<project name="platform/system/bluetooth" path="system/bluetooth" revision="930ae098543881f47eac054677726ee4b998b2f8"/>
|
||||
<project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="8a05fd72770a3b1fc23f3216a45318ad393fc4ca"/>
|
||||
<project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="d8040bc7850e326b297045ccbd51bfd7bf566a53"/>
|
||||
<project name="platform_system_core" path="system/core" remote="b2g" revision="542d1f59dc331b472307e5bd043101d14d5a3a3e"/>
|
||||
<project name="platform/system/extras" path="system/extras" revision="18c1180e848e7ab8691940481f5c1c8d22c37b3e"/>
|
||||
<project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="fe95bc6f83af5c18a73aa86c96e7fa7f79b91477"/>
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="966b3a7a13a7f0d5b86cbc9e64cb78d43ec7dba8"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="cba2f0bf49b882e0044c3cc583de8fcf83d2ffa4"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
|
||||
|
||||
@ -104,7 +104,7 @@ BluetoothInterface::GetInstance()
|
||||
#ifdef MOZ_B2G_BT_BLUEDROID
|
||||
static const char sDefaultBackend[] = "bluedroid";
|
||||
#else
|
||||
static const char const * sDefaultBackend = nullptr;
|
||||
static const char* const sDefaultBackend = nullptr;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
@ -834,6 +834,35 @@ BrowserElementParent.prototype = {
|
||||
{isActive: isActive});
|
||||
},
|
||||
|
||||
setNFCFocus: function(isFocus) {
|
||||
if (!this._isAlive()) {
|
||||
throw Components.Exception("Dead content process",
|
||||
Cr.NS_ERROR_DOM_INVALID_STATE_ERR);
|
||||
}
|
||||
|
||||
// For now, we use tab id as an identifier to let NFC module know
|
||||
// which app is in foreground. But this approach will not work in
|
||||
// in-process mode because tab id doesn't exist. Fix bug 1116449
|
||||
// if we are going to support in-process mode.
|
||||
try {
|
||||
var tabId = this._frameLoader.QueryInterface(Ci.nsIFrameLoader)
|
||||
.tabParent
|
||||
.tabId;
|
||||
} catch(e) {
|
||||
debug("SetNFCFocus for in-process mode is not yet supported");
|
||||
throw Components.Exception("SetNFCFocus for in-process mode is not yet supported",
|
||||
Cr.NS_ERROR_NOT_IMPLEMENTED);
|
||||
}
|
||||
|
||||
try {
|
||||
let nfcContentHelper =
|
||||
Cc["@mozilla.org/nfc/content-helper;1"].getService(Ci.nsINfcBrowserAPI);
|
||||
nfcContentHelper.setFocusApp(tabId, isFocus);
|
||||
} catch(e) {
|
||||
// Not all platforms support NFC
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Called when the visibility of the window which owns this iframe changes.
|
||||
*/
|
||||
|
||||
@ -26,7 +26,7 @@ interface nsIBrowserElementNextPaintListener : nsISupports
|
||||
* Interface to the BrowserElementParent implementation. All methods
|
||||
* but setFrameLoader throw when the remote process is dead.
|
||||
*/
|
||||
[scriptable, uuid(abae4fb1-7d6f-4e3f-b435-6501f1d4c659)]
|
||||
[scriptable, uuid(3811446f-90bb-42c1-b2b6-aae3603b61e1)]
|
||||
interface nsIBrowserElementAPI : nsISupports
|
||||
{
|
||||
void setFrameLoader(in nsIFrameLoader frameLoader);
|
||||
@ -71,4 +71,6 @@ interface nsIBrowserElementAPI : nsISupports
|
||||
void removeNextPaintListener(in nsIBrowserElementNextPaintListener listener);
|
||||
|
||||
nsIDOMDOMRequest setInputMethodActive(in boolean isActive);
|
||||
|
||||
void setNFCFocus(in boolean isFocus);
|
||||
};
|
||||
|
||||
@ -542,4 +542,36 @@ nsBrowserElement::SetInputMethodActive(bool aIsActive,
|
||||
return req.forget().downcast<DOMRequest>();
|
||||
}
|
||||
|
||||
void
|
||||
nsBrowserElement::SetNFCFocus(bool aIsFocus,
|
||||
ErrorResult& aRv)
|
||||
{
|
||||
NS_ENSURE_TRUE_VOID(IsBrowserElementOrThrow(aRv));
|
||||
|
||||
nsRefPtr<nsFrameLoader> frameLoader = GetFrameLoader();
|
||||
if (!frameLoader) {
|
||||
aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
|
||||
return;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIDOMElement> ownerElement;
|
||||
nsresult rv = frameLoader->GetOwnerElement(getter_AddRefs(ownerElement));
|
||||
if (NS_FAILED(rv)) {
|
||||
aRv.Throw(rv);
|
||||
return;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsINode> node = do_QueryInterface(ownerElement);
|
||||
nsCOMPtr<nsIPrincipal> principal = node->NodePrincipal();
|
||||
if (!nsContentUtils::IsExactSitePermAllow(principal, "nfc-manager")) {
|
||||
aRv.Throw(NS_ERROR_DOM_INVALID_ACCESS_ERR);
|
||||
return;
|
||||
}
|
||||
|
||||
rv = mBrowserElementAPI->SetNFCFocus(aIsFocus);
|
||||
if (NS_WARN_IF(NS_FAILED(rv))) {
|
||||
aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace mozilla
|
||||
|
||||
@ -89,6 +89,9 @@ public:
|
||||
already_AddRefed<dom::DOMRequest> SetInputMethodActive(bool isActive,
|
||||
ErrorResult& aRv);
|
||||
|
||||
void SetNFCFocus(bool isFocus,
|
||||
ErrorResult& aRv);
|
||||
|
||||
protected:
|
||||
NS_IMETHOD_(already_AddRefed<nsFrameLoader>) GetFrameLoader() = 0;
|
||||
nsCOMPtr<nsIBrowserElementAPI> mBrowserElementAPI;
|
||||
|
||||
@ -10,7 +10,7 @@ interface nsIWebBrowserChrome3;
|
||||
native CommandsArray(nsTArray<nsCString>);
|
||||
[ref] native CommandsArrayRef(nsTArray<nsCString>);
|
||||
|
||||
[scriptable, uuid(7227bac4-b6fe-4090-aeb4-bc288b790925)]
|
||||
[scriptable, uuid(1fb79c27-e760-4088-b19c-1ce3673ec24e)]
|
||||
interface nsITabChild : nsISupports
|
||||
{
|
||||
readonly attribute nsIContentFrameMessageManager messageManager;
|
||||
@ -22,5 +22,7 @@ interface nsITabChild : nsISupports
|
||||
[noscript, notxpcom] void enableDisableCommands(in AString action,
|
||||
in CommandsArrayRef enabledCommands,
|
||||
in CommandsArrayRef disabledCommands);
|
||||
|
||||
readonly attribute uint64_t tabId;
|
||||
};
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
#include "domstubs.idl"
|
||||
|
||||
[scriptable, uuid(33e8571d-5e5d-4000-81cf-e01f5f85d424)]
|
||||
[scriptable, uuid(30361a5b-a3b8-4dbc-b464-e08761abb123)]
|
||||
interface nsITabParent : nsISupports
|
||||
{
|
||||
void injectTouchEvent(in AString aType,
|
||||
@ -22,4 +22,6 @@ interface nsITabParent : nsISupports
|
||||
readonly attribute boolean useAsyncPanZoom;
|
||||
|
||||
void setIsDocShellActive(in bool aIsActive);
|
||||
|
||||
readonly attribute uint64_t tabId;
|
||||
};
|
||||
|
||||
@ -3372,6 +3372,14 @@ TabChild::EnableDisableCommands(const nsAString& aAction,
|
||||
aEnabledCommands, aDisabledCommands);
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
TabChild::GetTabId(uint64_t* aId)
|
||||
{
|
||||
*aId = GetTabId();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
bool
|
||||
TabChild::DoSendBlockingMessage(JSContext* aCx,
|
||||
const nsAString& aMessage,
|
||||
|
||||
@ -2503,6 +2503,13 @@ TabParent::SetIsDocShellActive(bool isActive)
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
TabParent::GetTabId(uint64_t* aId)
|
||||
{
|
||||
*aId = GetTabId();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
bool
|
||||
TabParent::RecvRemotePaintIsReady()
|
||||
{
|
||||
|
||||
@ -79,18 +79,21 @@ NfcContentHelper.prototype = {
|
||||
__proto__: DOMRequestIpcHelper.prototype,
|
||||
|
||||
QueryInterface: XPCOMUtils.generateQI([Ci.nsINfcContentHelper,
|
||||
Ci.nsINfcBrowserAPI,
|
||||
Ci.nsISupportsWeakReference,
|
||||
Ci.nsIObserver]),
|
||||
classID: NFCCONTENTHELPER_CID,
|
||||
classInfo: XPCOMUtils.generateCI({
|
||||
classID: NFCCONTENTHELPER_CID,
|
||||
classDescription: "NfcContentHelper",
|
||||
interfaces: [Ci.nsINfcContentHelper]
|
||||
interfaces: [Ci.nsINfcContentHelper,
|
||||
Ci.nsINfcBrowserAPI]
|
||||
}),
|
||||
|
||||
_window: null,
|
||||
_requestMap: null,
|
||||
_rfState: null,
|
||||
_tabId: null,
|
||||
eventListener: null,
|
||||
|
||||
init: function init(aWindow) {
|
||||
@ -112,6 +115,31 @@ NfcContentHelper.prototype = {
|
||||
|
||||
let info = cpmm.sendSyncMessage("NFC:QueryInfo")[0];
|
||||
this._rfState = info.rfState;
|
||||
|
||||
// For now, we assume app will run in oop mode so we can get
|
||||
// tab id for each app. Fix bug 1116449 if we are going to
|
||||
// support in-process mode.
|
||||
let docShell = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
|
||||
.getInterface(Ci.nsIWebNavigation)
|
||||
.QueryInterface(Ci.nsIDocShell);
|
||||
try {
|
||||
this._tabId = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
|
||||
.getInterface(Ci.nsITabChild)
|
||||
.tabId;
|
||||
} catch(e) {
|
||||
// Only parent process does not have tab id, so in this case
|
||||
// NfcContentHelper is used by system app. Use -1(tabId) to
|
||||
// indicate its system app.
|
||||
let inParent = Cc["@mozilla.org/xre/app-info;1"]
|
||||
.getService(Ci.nsIXULRuntime)
|
||||
.processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT;
|
||||
if (inParent) {
|
||||
this._tabId = -1;
|
||||
} else {
|
||||
throw Components.Exception("Can't get tab id in child process",
|
||||
Cr.NS_ERROR_UNEXPECTED);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
queryRFState: function queryRFState() {
|
||||
@ -132,6 +160,13 @@ NfcContentHelper.prototype = {
|
||||
return encodedRecords;
|
||||
},
|
||||
|
||||
setFocusApp: function setFocusApp(tabId, isFocus) {
|
||||
cpmm.sendAsyncMessage("NFC:SetFocusApp", {
|
||||
tabId: tabId,
|
||||
isFocus: isFocus
|
||||
});
|
||||
},
|
||||
|
||||
// NFCTag interface
|
||||
readNDEF: function readNDEF(sessionToken, callback) {
|
||||
let requestId = callback.getCallbackId();
|
||||
@ -207,7 +242,7 @@ NfcContentHelper.prototype = {
|
||||
|
||||
addEventListener: function addEventListener(listener) {
|
||||
this.eventListener = listener;
|
||||
cpmm.sendAsyncMessage("NFC:AddEventListener");
|
||||
cpmm.sendAsyncMessage("NFC:AddEventListener", { tabId: this._tabId });
|
||||
},
|
||||
|
||||
registerTargetForPeerReady: function registerTargetForPeerReady(appId) {
|
||||
|
||||
@ -75,7 +75,8 @@ const NFC_IPC_MSG_ENTRIES = [
|
||||
messages: ["NFC:CheckP2PRegistration",
|
||||
"NFC:NotifyUserAcceptedP2P",
|
||||
"NFC:NotifySendFileStatus",
|
||||
"NFC:ChangeRFState"] }
|
||||
"NFC:ChangeRFState",
|
||||
"NFC:SetFocusApp"] }
|
||||
];
|
||||
|
||||
XPCOMUtils.defineLazyServiceGetter(this, "ppmm",
|
||||
@ -97,7 +98,9 @@ XPCOMUtils.defineLazyGetter(this, "gMessageManager", function () {
|
||||
// Manage registered Peer Targets
|
||||
peerTargets: {},
|
||||
|
||||
eventListeners: [],
|
||||
eventListeners: {},
|
||||
|
||||
focusApp: null,
|
||||
|
||||
init: function init(nfc) {
|
||||
this.nfc = nfc;
|
||||
@ -172,18 +175,30 @@ XPCOMUtils.defineLazyGetter(this, "gMessageManager", function () {
|
||||
target.sendAsyncMessage("NFC:DOMEvent", options);
|
||||
},
|
||||
|
||||
addEventListener: function addEventListener(target) {
|
||||
if (this.eventListeners.indexOf(target) != -1) {
|
||||
setFocusApp: function setFocusApp(id, isFocus) {
|
||||
if (isFocus) {
|
||||
// Now we only support one focus app.
|
||||
this.focusApp = id;
|
||||
} else if (this.focusApp == id){
|
||||
// Set focusApp to null means currently there is no foreground app.
|
||||
this.focusApp = null;
|
||||
}
|
||||
},
|
||||
|
||||
addEventListener: function addEventListener(target, id) {
|
||||
if (this.eventListeners[id] !== undefined) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.eventListeners.push(target);
|
||||
this.eventListeners[id] = target;
|
||||
},
|
||||
|
||||
removeEventListener: function removeEventListener(target) {
|
||||
let index = this.eventListeners.indexOf(target);
|
||||
if (index !== -1) {
|
||||
this.eventListeners.splice(index, 1);
|
||||
for (let id in this.eventListeners) {
|
||||
if (target == this.eventListeners[id]) {
|
||||
delete this.eventListeners[id];
|
||||
break;
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@ -214,30 +229,33 @@ XPCOMUtils.defineLazyGetter(this, "gMessageManager", function () {
|
||||
|
||||
onTagFound: function onTagFound(message) {
|
||||
message.event = NFC.TAG_EVENT_FOUND;
|
||||
for (let target of this.eventListeners) {
|
||||
this.notifyDOMEvent(target, message);
|
||||
for (let id in this.eventListeners) {
|
||||
this.notifyDOMEvent(this.eventListeners[id], message);
|
||||
}
|
||||
delete message.event;
|
||||
},
|
||||
|
||||
onTagLost: function onTagLost(sessionToken) {
|
||||
for (let target of this.eventListeners) {
|
||||
this.notifyDOMEvent(target, {event: NFC.TAG_EVENT_LOST,
|
||||
sessionToken: sessionToken});
|
||||
for (let id in this.eventListeners) {
|
||||
this.notifyDOMEvent(this.eventListeners[id],
|
||||
{ event: NFC.TAG_EVENT_LOST,
|
||||
sessionToken: sessionToken });
|
||||
}
|
||||
},
|
||||
|
||||
onPeerEvent: function onPeerEvent(eventType, sessionToken) {
|
||||
for (let target of this.eventListeners) {
|
||||
this.notifyDOMEvent(target, { event: eventType,
|
||||
sessionToken: sessionToken });
|
||||
for (let id in this.eventListeners) {
|
||||
this.notifyDOMEvent(this.eventListeners[id],
|
||||
{ event: eventType,
|
||||
sessionToken: sessionToken });
|
||||
}
|
||||
},
|
||||
|
||||
onRFStateChange: function onRFStateChange(rfState) {
|
||||
for (let target of this.eventListeners) {
|
||||
this.notifyDOMEvent(target, { event: NFC.RF_EVENT_STATE_CHANGE,
|
||||
rfState: rfState});
|
||||
for (let id in this.eventListeners) {
|
||||
this.notifyDOMEvent(this.eventListeners[id],
|
||||
{ event: NFC.RF_EVENT_STATE_CHANGE,
|
||||
rfState: rfState });
|
||||
}
|
||||
},
|
||||
|
||||
@ -268,8 +286,11 @@ XPCOMUtils.defineLazyGetter(this, "gMessageManager", function () {
|
||||
}
|
||||
|
||||
switch (message.name) {
|
||||
case "NFC:SetFocusApp":
|
||||
this.setFocusApp(message.data.tabId, message.data.isFocus);
|
||||
return null;
|
||||
case "NFC:AddEventListener":
|
||||
this.addEventListener(message.target);
|
||||
this.addEventListener(message.target, message.data.tabId);
|
||||
return null;
|
||||
case "NFC:RegisterPeerReadyTarget":
|
||||
this.registerPeerReadyTarget(message.target, message.data.appId);
|
||||
|
||||
@ -102,6 +102,13 @@ interface nsINfcRequestCallback : nsISupports
|
||||
void notifyError(in DOMString errorMsg);
|
||||
};
|
||||
|
||||
[scriptable, uuid(7ae46728-bc42-44bd-8093-bc7563abf52d)]
|
||||
interface nsINfcBrowserAPI : nsISupports
|
||||
{
|
||||
void setFocusApp(in uint64_t tabId,
|
||||
in boolean isFocus);
|
||||
};
|
||||
|
||||
[scriptable, uuid(b5194ae8-d5d5-482f-a73f-dd0d755a1972)]
|
||||
interface nsINfcContentHelper : nsISupports
|
||||
{
|
||||
|
||||
@ -331,7 +331,6 @@ function MozNFCImpl() {
|
||||
|
||||
this.eventService = Cc["@mozilla.org/eventlistenerservice;1"]
|
||||
.getService(Ci.nsIEventListenerService);
|
||||
this._nfcContentHelper.addEventListener(this);
|
||||
}
|
||||
MozNFCImpl.prototype = {
|
||||
_nfcContentHelper: null,
|
||||
@ -353,6 +352,7 @@ MozNFCImpl.prototype = {
|
||||
|
||||
if (this._nfcContentHelper) {
|
||||
this._nfcContentHelper.init(aWindow);
|
||||
this._nfcContentHelper.addEventListener(this);
|
||||
this._rfState = this._nfcContentHelper.queryRFState();
|
||||
}
|
||||
},
|
||||
|
||||
@ -96,17 +96,13 @@ MozMtpStorage::StorageAvailable()
|
||||
|
||||
MOZ_ASSERT(!mMtpStorage);
|
||||
|
||||
//TODO: For now we assume that the storage removable unless we're sure it's
|
||||
// not. Bug 1033952 will add an isRemovable attribute to the Volume
|
||||
// and then we'll know properly.
|
||||
|
||||
//TODO: Figure out what to do about maxFileSize.
|
||||
|
||||
mMtpStorage.reset(new MtpStorage(mStorageID, // id
|
||||
mountPoint.get(), // filePath
|
||||
mVolume->NameStr(), // description
|
||||
1024uLL * 1024uLL, // reserveSpace
|
||||
true, // removable
|
||||
mMtpStorage.reset(new MtpStorage(mStorageID, // id
|
||||
mountPoint.get(), // filePath
|
||||
mVolume->NameStr(), // description
|
||||
1024uLL * 1024uLL, // reserveSpace
|
||||
mVolume->IsHotSwappable(), // removable
|
||||
2uLL * 1024uLL * 1024uLL * 1024uLL)); // maxFileSize
|
||||
nsRefPtr<RefCountedMtpServer> server = mMozMtpServer->GetMtpServer();
|
||||
|
||||
|
||||
@ -139,4 +139,10 @@ interface BrowserElementPrivileged {
|
||||
Pref="dom.mozBrowserFramesEnabled",
|
||||
CheckPermissions="browser"]
|
||||
DOMRequest setInputMethodActive(boolean isActive);
|
||||
|
||||
// Additional |nfc-manager| permission is required for setNFCFocus API
|
||||
[Throws,
|
||||
Pref="dom.mozBrowserFramesEnabled",
|
||||
CheckPermissions="browser"]
|
||||
void setNFCFocus(boolean isFocus);
|
||||
};
|
||||
|
||||
@ -25,29 +25,6 @@ const uint64_t CONTENT_PROCESS_ID_MAIN = 0;
|
||||
* in the gonk subsystem.
|
||||
* If these change and are exposed to JS, make sure nsIHal.idl is updated as well.
|
||||
*/
|
||||
enum LightType {
|
||||
eHalLightID_Backlight = 0,
|
||||
eHalLightID_Keyboard = 1,
|
||||
eHalLightID_Buttons = 2,
|
||||
eHalLightID_Battery = 3,
|
||||
eHalLightID_Notifications = 4,
|
||||
eHalLightID_Attention = 5,
|
||||
eHalLightID_Bluetooth = 6,
|
||||
eHalLightID_Wifi = 7,
|
||||
eHalLightID_Count = 8 // This should stay at the end
|
||||
};
|
||||
enum LightMode {
|
||||
eHalLightMode_User = 0, // brightness is managed by user setting
|
||||
eHalLightMode_Sensor = 1, // brightness is managed by a light sensor
|
||||
eHalLightMode_Count
|
||||
};
|
||||
enum FlashMode {
|
||||
eHalLightFlash_None = 0,
|
||||
eHalLightFlash_Timed = 1, // timed flashing. Use flashOnMS and flashOffMS for timing
|
||||
eHalLightFlash_Hardware = 2, // hardware assisted flashing
|
||||
eHalLightFlash_Count
|
||||
};
|
||||
|
||||
enum ShutdownMode {
|
||||
eHalShutdownMode_Unknown = -1,
|
||||
eHalShutdownMode_PowerOff = 0,
|
||||
@ -233,39 +210,6 @@ typedef Observer<FMRadioRDSGroup> FMRadioRDSObserver;
|
||||
|
||||
namespace IPC {
|
||||
|
||||
/**
|
||||
* Light type serializer.
|
||||
*/
|
||||
template <>
|
||||
struct ParamTraits<mozilla::hal::LightType>
|
||||
: public ContiguousEnumSerializer<
|
||||
mozilla::hal::LightType,
|
||||
mozilla::hal::eHalLightID_Backlight,
|
||||
mozilla::hal::eHalLightID_Count>
|
||||
{};
|
||||
|
||||
/**
|
||||
* Light mode serializer.
|
||||
*/
|
||||
template <>
|
||||
struct ParamTraits<mozilla::hal::LightMode>
|
||||
: public ContiguousEnumSerializer<
|
||||
mozilla::hal::LightMode,
|
||||
mozilla::hal::eHalLightMode_User,
|
||||
mozilla::hal::eHalLightMode_Count>
|
||||
{};
|
||||
|
||||
/**
|
||||
* Flash mode serializer.
|
||||
*/
|
||||
template <>
|
||||
struct ParamTraits<mozilla::hal::FlashMode>
|
||||
: public ContiguousEnumSerializer<
|
||||
mozilla::hal::FlashMode,
|
||||
mozilla::hal::eHalLightFlash_None,
|
||||
mozilla::hal::eHalLightFlash_Count>
|
||||
{};
|
||||
|
||||
/**
|
||||
* Serializer for ShutdownMode.
|
||||
*/
|
||||
|
||||
@ -113,16 +113,44 @@ using namespace mozilla::dom;
|
||||
namespace mozilla {
|
||||
namespace hal_impl {
|
||||
|
||||
/**
|
||||
* These are defined by libhardware, specifically, hardware/libhardware/include/hardware/lights.h
|
||||
* in the gonk subsystem.
|
||||
* If these change and are exposed to JS, make sure nsIHal.idl is updated as well.
|
||||
*/
|
||||
enum LightType {
|
||||
eHalLightID_Backlight = 0,
|
||||
eHalLightID_Keyboard = 1,
|
||||
eHalLightID_Buttons = 2,
|
||||
eHalLightID_Battery = 3,
|
||||
eHalLightID_Notifications = 4,
|
||||
eHalLightID_Attention = 5,
|
||||
eHalLightID_Bluetooth = 6,
|
||||
eHalLightID_Wifi = 7,
|
||||
eHalLightID_Count // This should stay at the end
|
||||
};
|
||||
enum LightMode {
|
||||
eHalLightMode_User = 0, // brightness is managed by user setting
|
||||
eHalLightMode_Sensor = 1, // brightness is managed by a light sensor
|
||||
eHalLightMode_Count
|
||||
};
|
||||
enum FlashMode {
|
||||
eHalLightFlash_None = 0,
|
||||
eHalLightFlash_Timed = 1, // timed flashing. Use flashOnMS and flashOffMS for timing
|
||||
eHalLightFlash_Hardware = 2, // hardware assisted flashing
|
||||
eHalLightFlash_Count
|
||||
};
|
||||
|
||||
struct LightConfiguration {
|
||||
hal::LightType light;
|
||||
hal::LightMode mode;
|
||||
hal::FlashMode flash;
|
||||
LightType light;
|
||||
LightMode mode;
|
||||
FlashMode flash;
|
||||
uint32_t flashOnMS;
|
||||
uint32_t flashOffMS;
|
||||
uint32_t color;
|
||||
};
|
||||
|
||||
static light_device_t* sLights[hal::eHalLightID_Count]; // will be initialized to nullptr
|
||||
static light_device_t* sLights[eHalLightID_Count]; // will be initialized to nullptr
|
||||
|
||||
static light_device_t*
|
||||
GetDevice(hw_module_t* module, char const* name)
|
||||
@ -142,27 +170,27 @@ InitLights()
|
||||
{
|
||||
// assume that if backlight is nullptr, nothing has been set yet
|
||||
// if this is not true, the initialization will occur everytime a light is read or set!
|
||||
if (!sLights[hal::eHalLightID_Backlight]) {
|
||||
if (!sLights[eHalLightID_Backlight]) {
|
||||
int err;
|
||||
hw_module_t* module;
|
||||
|
||||
err = hw_get_module(LIGHTS_HARDWARE_MODULE_ID, (hw_module_t const**)&module);
|
||||
if (err == 0) {
|
||||
sLights[hal::eHalLightID_Backlight]
|
||||
sLights[eHalLightID_Backlight]
|
||||
= GetDevice(module, LIGHT_ID_BACKLIGHT);
|
||||
sLights[hal::eHalLightID_Keyboard]
|
||||
sLights[eHalLightID_Keyboard]
|
||||
= GetDevice(module, LIGHT_ID_KEYBOARD);
|
||||
sLights[hal::eHalLightID_Buttons]
|
||||
sLights[eHalLightID_Buttons]
|
||||
= GetDevice(module, LIGHT_ID_BUTTONS);
|
||||
sLights[hal::eHalLightID_Battery]
|
||||
sLights[eHalLightID_Battery]
|
||||
= GetDevice(module, LIGHT_ID_BATTERY);
|
||||
sLights[hal::eHalLightID_Notifications]
|
||||
sLights[eHalLightID_Notifications]
|
||||
= GetDevice(module, LIGHT_ID_NOTIFICATIONS);
|
||||
sLights[hal::eHalLightID_Attention]
|
||||
sLights[eHalLightID_Attention]
|
||||
= GetDevice(module, LIGHT_ID_ATTENTION);
|
||||
sLights[hal::eHalLightID_Bluetooth]
|
||||
sLights[eHalLightID_Bluetooth]
|
||||
= GetDevice(module, LIGHT_ID_BLUETOOTH);
|
||||
sLights[hal::eHalLightID_Wifi]
|
||||
sLights[eHalLightID_Wifi]
|
||||
= GetDevice(module, LIGHT_ID_WIFI);
|
||||
}
|
||||
}
|
||||
@ -172,7 +200,7 @@ InitLights()
|
||||
* The state last set for the lights until liblights supports
|
||||
* getting the light state.
|
||||
*/
|
||||
static light_state_t sStoredLightState[hal::eHalLightID_Count];
|
||||
static light_state_t sStoredLightState[eHalLightID_Count];
|
||||
|
||||
/**
|
||||
* Set the value of a light to a particular color, with a specific flash pattern.
|
||||
@ -185,13 +213,13 @@ static light_state_t sStoredLightState[hal::eHalLightID_Count];
|
||||
* returns true if successful and false if failed.
|
||||
*/
|
||||
static bool
|
||||
SetLight(hal::LightType light, const LightConfiguration& aConfig)
|
||||
SetLight(LightType light, const LightConfiguration& aConfig)
|
||||
{
|
||||
light_state_t state;
|
||||
|
||||
InitLights();
|
||||
|
||||
if (light < 0 || light >= hal::eHalLightID_Count ||
|
||||
if (light < 0 || light >= eHalLightID_Count ||
|
||||
sLights[light] == nullptr) {
|
||||
return false;
|
||||
}
|
||||
@ -213,11 +241,11 @@ SetLight(hal::LightType light, const LightConfiguration& aConfig)
|
||||
* returns true if successful and false if failed.
|
||||
*/
|
||||
static bool
|
||||
GetLight(hal::LightType light, LightConfiguration* aConfig)
|
||||
GetLight(LightType light, LightConfiguration* aConfig)
|
||||
{
|
||||
light_state_t state;
|
||||
|
||||
if (light < 0 || light >= hal::eHalLightID_Count ||
|
||||
if (light < 0 || light >= eHalLightID_Count ||
|
||||
sLights[light] == nullptr) {
|
||||
return false;
|
||||
}
|
||||
@ -227,10 +255,10 @@ GetLight(hal::LightType light, LightConfiguration* aConfig)
|
||||
|
||||
aConfig->light = light;
|
||||
aConfig->color = state.color;
|
||||
aConfig->flash = hal::FlashMode(state.flashMode);
|
||||
aConfig->flash = FlashMode(state.flashMode);
|
||||
aConfig->flashOnMS = state.flashOnMS;
|
||||
aConfig->flashOffMS = state.flashOffMS;
|
||||
aConfig->mode = hal::LightMode(state.brightnessMode);
|
||||
aConfig->mode = LightMode(state.brightnessMode);
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -409,13 +437,13 @@ public:
|
||||
} // else turn off battery indicator.
|
||||
|
||||
LightConfiguration aConfig;
|
||||
aConfig.light = hal::eHalLightID_Battery;
|
||||
aConfig.mode = hal::eHalLightMode_User;
|
||||
aConfig.flash = hal::eHalLightFlash_None;
|
||||
aConfig.light = eHalLightID_Battery;
|
||||
aConfig.mode = eHalLightMode_User;
|
||||
aConfig.flash = eHalLightFlash_None;
|
||||
aConfig.flashOnMS = aConfig.flashOffMS = 0;
|
||||
aConfig.color = color;
|
||||
|
||||
SetLight(hal::eHalLightID_Battery, aConfig);
|
||||
SetLight(eHalLightID_Battery, aConfig);
|
||||
|
||||
hal::NotifyBatteryChange(info);
|
||||
|
||||
@ -655,7 +683,7 @@ bool
|
||||
GetKeyLightEnabled()
|
||||
{
|
||||
LightConfiguration config;
|
||||
GetLight(hal::eHalLightID_Buttons, &config);
|
||||
GetLight(eHalLightID_Buttons, &config);
|
||||
return (config.color != 0x00000000);
|
||||
}
|
||||
|
||||
@ -663,8 +691,8 @@ void
|
||||
SetKeyLightEnabled(bool aEnabled)
|
||||
{
|
||||
LightConfiguration config;
|
||||
config.mode = hal::eHalLightMode_User;
|
||||
config.flash = hal::eHalLightFlash_None;
|
||||
config.mode = eHalLightMode_User;
|
||||
config.flash = eHalLightFlash_None;
|
||||
config.flashOnMS = config.flashOffMS = 0;
|
||||
config.color = 0x00000000;
|
||||
|
||||
@ -679,15 +707,15 @@ SetKeyLightEnabled(bool aEnabled)
|
||||
config.color = color;
|
||||
}
|
||||
|
||||
SetLight(hal::eHalLightID_Buttons, config);
|
||||
SetLight(hal::eHalLightID_Keyboard, config);
|
||||
SetLight(eHalLightID_Buttons, config);
|
||||
SetLight(eHalLightID_Keyboard, config);
|
||||
}
|
||||
|
||||
double
|
||||
GetScreenBrightness()
|
||||
{
|
||||
LightConfiguration config;
|
||||
hal::LightType light = hal::eHalLightID_Backlight;
|
||||
LightType light = eHalLightID_Backlight;
|
||||
|
||||
GetLight(light, &config);
|
||||
// backlight is brightness only, so using one of the RGB elements as value.
|
||||
@ -711,14 +739,14 @@ SetScreenBrightness(double brightness)
|
||||
uint32_t color = (0xff<<24) + (val<<16) + (val<<8) + val;
|
||||
|
||||
LightConfiguration config;
|
||||
config.mode = hal::eHalLightMode_User;
|
||||
config.flash = hal::eHalLightFlash_None;
|
||||
config.mode = eHalLightMode_User;
|
||||
config.flash = eHalLightFlash_None;
|
||||
config.flashOnMS = config.flashOffMS = 0;
|
||||
config.color = color;
|
||||
SetLight(hal::eHalLightID_Backlight, config);
|
||||
SetLight(eHalLightID_Backlight, config);
|
||||
if (GetKeyLightEnabled()) {
|
||||
SetLight(hal::eHalLightID_Buttons, config);
|
||||
SetLight(hal::eHalLightID_Keyboard, config);
|
||||
SetLight(eHalLightID_Buttons, config);
|
||||
SetLight(eHalLightID_Keyboard, config);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user