ALL: Sync with ScummVM

This commit is contained in:
Pawel Kolodziejski 2016-11-12 12:59:06 +01:00
parent 2b4320fab7
commit 19bcd1f3bc
376 changed files with 52910 additions and 13744 deletions

View file

@ -401,7 +401,8 @@ bool OSystem_Android::hasFeature(Feature f) {
#ifdef USE_OPENGL
f == kFeatureOpenGL ||
#endif
f == kFeatureOverlaySupportsAlpha);
f == kFeatureOverlaySupportsAlpha ||
f == kFeatureOpenUrl);
}
void OSystem_Android::setFeatureState(Feature f, bool enable) {
@ -591,6 +592,10 @@ Common::String OSystem_Android::getSystemLanguage() const {
getSystemProperty("persist.sys.country").c_str());
}
bool OSystem_Android::openUrl(const Common::String &url) {
return JNI::openUrl(url.c_str());
}
Common::String OSystem_Android::getSystemProperty(const char *name) const {
char value[PROP_VALUE_MAX];