summaryrefslogtreecommitdiffstats
path: root/minui/resources.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--minui/resources.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/minui/resources.cpp b/minui/resources.cpp
index 8f8d36d27..b9797b905 100644
--- a/minui/resources.cpp
+++ b/minui/resources.cpp
@@ -29,7 +29,7 @@
#include <string>
#include <vector>
-#include <android-base/strings.h>
+//#include <android-base/strings.h> // does not exist in 6.0
#include <png.h>
#include "minui/minui.h"
@@ -325,6 +325,12 @@ exit:
return result;
}
+int res_create_multi_display_surface(const char* name, int* frames,
+ GRSurface*** pSurface) {
+ int fps = 0;
+ return res_create_multi_display_surface(name, frames, &fps, pSurface);
+}
+
int res_create_alpha_surface(const char* name, GRSurface** pSurface) {
GRSurface* surface = NULL;
int result = 0;
@@ -384,7 +390,8 @@ bool matches_locale(const std::string& prefix, const std::string& locale) {
// match the locale string without the {script} section.
// For instance, prefix == "en" matches locale == "en-US", prefix == "sr-Latn" matches locale
// == "sr-Latn-BA", and prefix == "zh-CN" matches locale == "zh-Hans-CN".
- if (android::base::StartsWith(locale, prefix.c_str())) {
+ //if (android::base::StartsWith(locale, prefix.c_str())) { // does not exist in 6.0
+ if (strncmp(prefix.c_str(), locale.c_str(), prefix.length()) == 0) {
return true;
}