wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1071091 - Restrict the system download manager to non-release builds for now. r=nalexander

Browse Source
This commit is contained in:
wesj 2014-09-24 22:29:00 -07:00
parent b3cce5583a
commit 5b33ccde26
6 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.in
View File

@ -3846,6 +3846,7 @@ MOZ_WEBSMS_BACKEND=
MOZ_ANDROID_BEAM=
MOZ_LOCALE_SWITCHER=
MOZ_ANDROID_SEARCH_ACTIVITY=
MOZ_ANDROID_DOWNLOADS_INTEGRATION=
MOZ_ANDROID_MLS_STUMBLER=
MOZ_ANDROID_SHARE_OVERLAY=
ACCESSIBILITY=1
@ -4859,6 +4860,13 @@ if test -n "$MOZ_LOCALE_SWITCHER"; then
AC_DEFINE(MOZ_LOCALE_SWITCHER)
fi
dnl ========================================================
dnl = Enable system download manager on Android
dnl ========================================================
if test -n "$MOZ_ANDROID_DOWNLOADS_INTEGRATION"; then
AC_DEFINE(MOZ_ANDROID_DOWNLOADS_INTEGRATION)
fi
dnl ========================================================
dnl = Enable NFC permission on Android
dnl ========================================================
@ -8497,6 +8505,7 @@ AC_SUBST(MOZ_DISABLE_GECKOVIEW)
AC_SUBST(MOZ_ANDROID_SEARCH_ACTIVITY)
AC_SUBST(MOZ_ANDROID_SHARE_OVERLAY)
AC_SUBST(MOZ_ANDROID_MLS_STUMBLER)
AC_SUBST(MOZ_ANDROID_DOWNLOADS_INTEGRATION)
AC_SUBST(ENABLE_STRIP)
AC_SUBST(PKG_SKIP_STRIP)
AC_SUBST(STRIP_FLAGS)

2
mobile/android/base/AndroidManifest.xml.in
View File

@ -40,7 +40,9 @@
<uses-permission android:name="@ANDROID_PACKAGE_NAME@.permissions.PASSWORD_PROVIDER"/>
<uses-permission android:name="@ANDROID_PACKAGE_NAME@.permissions.BROWSER_PROVIDER"/>
<uses-permission android:name="@ANDROID_PACKAGE_NAME@.permissions.FORMHISTORY_PROVIDER"/>
#ifdef MOZ_ANDROID_DOWNLOADS_INTEGRATION
<uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
#endif
#ifdef MOZ_WEBSMS_BACKEND
<!-- WebSMS -->
<uses-permission android:name="android.permission.SEND_SMS"/>

7
mobile/android/base/AppConstants.java.in
View File

@ -255,4 +255,11 @@ public class AppConstants {
#else
false;
#endif
public static final boolean ANDROID_DOWNLOADS_INTEGRATION =
#ifdef MOZ_ANDROID_DOWNLOADS_INTEGRATION
AppConstants.Versions.feature12Plus;
#else
false;
#endif
}

2
mobile/android/base/GeckoAppShell.java
View File

@ -1807,7 +1807,7 @@ public class GeckoAppShell
}
final File f = new File(aFile);
if (AppConstants.Versions.feature12Plus) {
if (AppConstants.ANDROID_DOWNLOADS_INTEGRATION) {
final DownloadManager dm = (DownloadManager) getContext().getSystemService(Context.DOWNLOAD_SERVICE);
dm.addCompletedDownload(f.getName(),
f.getName(),

2
mobile/android/base/moz.build
View File

@ -620,7 +620,7 @@ ANDROID_GENERATED_RESFILES += [
for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT', 'MOZILLA_OFFICIAL', 'MOZ_DEBUG',
'MOZ_ANDROID_SEARCH_ACTIVITY', 'MOZ_NATIVE_DEVICES', 'MOZ_ANDROID_MLS_STUMBLER',
'MOZ_ANDROID_SHARE_OVERLAY'):
'MOZ_ANDROID_SHARE_OVERLAY', 'MOZ_ANDROID_DOWNLOADS_INTEGRATION'):
if CONFIG[var]:
DEFINES[var] = 1

6
mobile/android/confvars.sh
View File

@ -93,5 +93,11 @@ else
MOZ_ANDROID_MLS_STUMBLER=
fi
# Enable adding to the system downloads list in pre-release builds.
if test ! "$RELEASE_BUILD"; then
MOZ_ANDROID_DOWNLOADS_INTEGRATION=1
fi
# Enable generational GC on mobile.
JSGC_GENERATIONAL=1