mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge m-c to m-i

This commit is contained in:
Phil Ringnalda 2014-09-14 11:45:08 -07:00
Родитель 29faebcf25 713c41b609
Коммит e45aa042bd
16 изменённых файлов: 30 добавлений и 27 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
b2g/config/dolphin/sources.xml
Просмотреть файл

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="fe92ddd450e03b38edb2d465de7897971d68ac68">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="e5da0e462e51cf7f56963e87deb845f87a3a1cf4"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0f45989dfa25d15ad3d6e0bef41847e46d0da774"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="6969df171e5295f855f12d12db0382048e6892e7"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

2
b2g/config/emulator-ics/sources.xml
Просмотреть файл

@ -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="e5da0e462e51cf7f56963e87deb845f87a3a1cf4"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="0f45989dfa25d15ad3d6e0bef41847e46d0da774"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="6969df171e5295f855f12d12db0382048e6892e7"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>

2
b2g/config/emulator-jb/sources.xml
Просмотреть файл

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="e5da0e462e51cf7f56963e87deb845f87a3a1cf4"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0f45989dfa25d15ad3d6e0bef41847e46d0da774"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="6969df171e5295f855f12d12db0382048e6892e7"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="e29a2effcf580682728fcbab5608bcf82aad48b0"/>

2
b2g/config/emulator-kk/sources.xml
Просмотреть файл

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="fe92ddd450e03b38edb2d465de7897971d68ac68">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="e5da0e462e51cf7f56963e87deb845f87a3a1cf4"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0f45989dfa25d15ad3d6e0bef41847e46d0da774"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="6969df171e5295f855f12d12db0382048e6892e7"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

2
b2g/config/emulator/sources.xml
Просмотреть файл

@ -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="e5da0e462e51cf7f56963e87deb845f87a3a1cf4"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="0f45989dfa25d15ad3d6e0bef41847e46d0da774"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="6969df171e5295f855f12d12db0382048e6892e7"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>

6
b2g/config/flame-kk/sources.xml
Просмотреть файл

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="fe92ddd450e03b38edb2d465de7897971d68ac68">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="e5da0e462e51cf7f56963e87deb845f87a3a1cf4"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0f45989dfa25d15ad3d6e0bef41847e46d0da774"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="6969df171e5295f855f12d12db0382048e6892e7"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
@ -132,9 +132,9 @@
<!-- Flame specific things -->
<project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="1bb28abbc215f45220620af5cd60a8ac1be93722"/>
<project name="device/qcom/common" path="device/qcom/common" revision="54c32c2ddef066fbdf611d29e4b7c47e0363599e"/>
<project name="device-flame" path="device/t2m/flame" remote="b2g" revision="8f988f3950da8d55676b3b77b09d5722b967e07b"/>
<project name="device-flame" path="device/t2m/flame" remote="b2g" revision="6f72b9d7a2322043fd0c4ba889ad689b084081c5"/>
<project name="codeaurora_kernel_msm" path="kernel" remote="b2g" revision="893238eb1215f8fd4f3747169170cc5e1cc33969"/>
<project name="kernel_lk" path="bootable/bootloader/lk" remote="b2g" revision="9e62af4da848d56841bdde326f9bba26c743c33a"/>
<project name="kernel_lk" path="bootable/bootloader/lk" remote="b2g" revision="fda40423ffa573dc6cafd3780515010cb2a086be"/>
<project name="platform/external/bluetooth/bluedroid" path="external/bluetooth/bluedroid" revision="082a1f98422e6a6b56f61218d6fcf465e85d4c58"/>
<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"/>

6
b2g/config/flame/sources.xml
Просмотреть файл

@ -17,7 +17,7 @@
</project>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="e5da0e462e51cf7f56963e87deb845f87a3a1cf4"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0f45989dfa25d15ad3d6e0bef41847e46d0da774"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="6969df171e5295f855f12d12db0382048e6892e7"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="e29a2effcf580682728fcbab5608bcf82aad48b0"/>
@ -122,9 +122,9 @@
<!-- Flame specific things -->
<project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="e8a318f7690092e639ba88891606f4183e846d3f"/>
<project name="device/qcom/common" path="device/qcom/common" revision="878804e0becfe5635bb8ccbf2671333d546c6fb6"/>
<project name="device-flame" path="device/t2m/flame" remote="b2g" revision="55ba09d8edffe7daffd954986b913319fd97890f"/>
<project name="device-flame" path="device/t2m/flame" remote="b2g" revision="eab9ed2db026c9a2c7943f3bfac350255fa46691"/>
<project name="codeaurora_kernel_msm" path="kernel" remote="b2g" revision="49417cfc622074daa3c76b345a199f6731375800"/>
<project name="kernel_lk" path="bootable/bootloader/lk" remote="b2g" revision="9eb619d2efdf4bd121587d8296f5c10481f750b8"/>
<project name="kernel_lk" path="bootable/bootloader/lk" remote="b2g" revision="6f00133ac0f47e90027bd7e263a16b405bfac503"/>
<project name="platform_bootable_recovery" path="bootable/recovery" remote="b2g" revision="e81502511cda303c803e63f049574634bc96f9f2"/>
<project name="platform/external/bluetooth/bluedroid" path="external/bluetooth/bluedroid" revision="81c4a859d75d413ad688067829d21b7ba9205f81"/>
<project name="platform/external/bluetooth/bluez" path="external/bluetooth/bluez" revision="f0689ac1914cdbc59e53bdc9edd9013dc157c299"/>

2
b2g/config/gaia.json
Просмотреть файл

@ -4,6 +4,6 @@
"remote": "",
"branch": ""
},
"revision": "90c5e3b6bc763bd6a40aa5671801ff6852ad951d",
"revision": "37ff07d95f189268c73477f4c03502c6d7105750",
"repo_path": "/integration/gaia-central"
}

2
b2g/config/hamachi/sources.xml
Просмотреть файл

@ -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="e5da0e462e51cf7f56963e87deb845f87a3a1cf4"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="0f45989dfa25d15ad3d6e0bef41847e46d0da774"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="6969df171e5295f855f12d12db0382048e6892e7"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

2
b2g/config/helix/sources.xml
Просмотреть файл

@ -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="e5da0e462e51cf7f56963e87deb845f87a3a1cf4"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="0f45989dfa25d15ad3d6e0bef41847e46d0da774"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="6969df171e5295f855f12d12db0382048e6892e7"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

2
b2g/config/nexus-4/sources.xml
Просмотреть файл

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="e5da0e462e51cf7f56963e87deb845f87a3a1cf4"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0f45989dfa25d15ad3d6e0bef41847e46d0da774"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="6969df171e5295f855f12d12db0382048e6892e7"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="e29a2effcf580682728fcbab5608bcf82aad48b0"/>

2
b2g/config/wasabi/sources.xml
Просмотреть файл

@ -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="e5da0e462e51cf7f56963e87deb845f87a3a1cf4"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="0f45989dfa25d15ad3d6e0bef41847e46d0da774"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="6969df171e5295f855f12d12db0382048e6892e7"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

2
mobile/android/base/LightweightTheme.java
Просмотреть файл

@ -170,7 +170,7 @@ public class LightweightTheme implements GeckoEventListener {
// The bitmap image might be smaller than the device's width.
// If it's smaller, fill the extra space on the left with the dominant color.
if (bitmapWidth >= maxWidth) {
mBitmap = bitmap;
mBitmap = Bitmap.createBitmap(bitmap, bitmapWidth - maxWidth, 0, maxWidth, bitmapHeight);
} else {
Paint paint = new Paint();
paint.setAntiAlias(true);

15
mobile/android/base/RestrictedProfiles.java
Просмотреть файл

@ -44,7 +44,7 @@ public class RestrictedProfiles {
}
}
private static String geckoActionToRestrction(int action) {
private static String geckoActionToRestriction(int action) {
for (Restriction rest : Restriction.values()) {
if (rest.id == action) {
return rest.name;
@ -54,7 +54,7 @@ public class RestrictedProfiles {
throw new IllegalArgumentException("Unknown action " + action);
}
private static Bundle getRestrctions() {
private static Bundle getRestrictions() {
final UserManager mgr = (UserManager) GeckoAppShell.getContext().getSystemService(Context.USER_SERVICE);
return mgr.getUserRestrictions();
}
@ -70,7 +70,7 @@ public class RestrictedProfiles {
return false;
}
return !getRestrctions().isEmpty();
return !getRestrictions().isEmpty();
}
public static boolean isAllowed(Restriction action) {
@ -89,8 +89,9 @@ public class RestrictedProfiles {
}
try {
final String restriction = geckoActionToRestrction(action);
return !getRestrctions().getBoolean(restriction, false);
// NOTE: Restrictions hold the opposite intention, so we need to flip it
final String restriction = geckoActionToRestriction(action);
return !getRestrictions().getBoolean(restriction, false);
} catch(IllegalArgumentException ex) {
Log.i(LOGTAG, "Invalid action", ex);
}
@ -117,7 +118,7 @@ public class RestrictedProfiles {
}
final JSONObject json = new JSONObject();
final Bundle restrictions = getRestrctions();
final Bundle restrictions = getRestrictions();
final Set<String> keys = restrictions.keySet();
for (String key : keys) {
@ -129,4 +130,4 @@ public class RestrictedProfiles {
return json.toString();
}
}
}

5
mobile/android/base/tests/testRestrictedProfiles.js
Просмотреть файл

@ -17,6 +17,7 @@ add_task(function test_isUserRestricted() {
// In an admin profile, like the tests: enabled = false
// In a restricted profile: enabled = true
do_check_false(pc.parentalControlsEnabled);
do_check_false(pc.blockFileDownloadsEnabled);
do_check_true(pc.isAllowed(Ci.nsIParentalControlsService.DOWNLOAD));
do_check_true(pc.isAllowed(Ci.nsIParentalControlsService.INSTALL_EXTENSION));
@ -37,12 +38,12 @@ add_task(function test_getUserRestrictions() {
var jenv = null;
try {
jenv = JNI.GetForThread();
var geckoAppShell = JNI.LoadClass(jenv, "org.mozilla.gecko.RestrictedProfile", {
var profile = JNI.LoadClass(jenv, "org.mozilla.gecko.RestrictedProfile", {
static_methods: [
{ name: "getUserRestrictions", sig: "()Ljava/lang/String;" },
],
});
restrictions = JNI.ReadString(jenv, geckoAppShell.getUserRestrictions());
restrictions = JNI.ReadString(jenv, profile.getUserRestrictions());
} finally {
if (jenv) {
JNI.UnloadClasses(jenv);

3
toolkit/components/parentalcontrols/nsParentalControlsServiceAndroid.cpp
Просмотреть файл

@ -32,9 +32,10 @@ nsParentalControlsService::GetParentalControlsEnabled(bool *aResult)
NS_IMETHODIMP
nsParentalControlsService::GetBlockFileDownloadsEnabled(bool *aResult)
{
// NOTE: isAllowed returns the opposite intention, so we need to flip it
bool res;
IsAllowed(nsIParentalControlsService::DOWNLOAD, NULL, &res);
*aResult = res;
*aResult = !res;
return NS_OK;
}