Merge "Fix compilation warnings in Room" into oc-support-26.0-dev
diff --git a/app-toolkit/dependencies.gradle b/app-toolkit/dependencies.gradle
index 5d7ba57..bec804a 100644
--- a/app-toolkit/dependencies.gradle
+++ b/app-toolkit/dependencies.gradle
@@ -84,5 +84,5 @@
ext.tools.current_sdk = gradle.ext.currentSdk
ext.tools.build_tools_version = rootProject.ext.buildToolsVersion
ext.flatfoot = [:]
-ext.flatfoot.release_version = "1.0.0-alpha7"
+ext.flatfoot.release_version = "1.0.0-alpha8"
ext.flatfoot.min_sdk = 14
diff --git a/compat/java/android/support/v4/graphics/TypefaceCompatApi26Impl.java b/compat/java/android/support/v4/graphics/TypefaceCompatApi26Impl.java
index b217c00..c7066c8 100644
--- a/compat/java/android/support/v4/graphics/TypefaceCompatApi26Impl.java
+++ b/compat/java/android/support/v4/graphics/TypefaceCompatApi26Impl.java
@@ -284,7 +284,7 @@
public Typeface createFromResourcesFontFile(
Context context, Resources resources, int id, String path, int style) {
if (!isFontFamilyPrivateAPIAvailable()) {
- super.createFromResourcesFontFile(context, resources, id, path, style);
+ return super.createFromResourcesFontFile(context, resources, id, path, style);
}
Object fontFamily = newFamily();
if (!addFontFromAssetManager(context, fontFamily, path,
diff --git a/core-utils/Android.mk b/core-utils/Android.mk
index b22c376..5ea200e 100644
--- a/core-utils/Android.mk
+++ b/core-utils/Android.mk
@@ -29,10 +29,7 @@
LOCAL_SRC_FILES := \
$(call all-java-files-under,gingerbread) \
$(call all-java-files-under,kitkat) \
- $(call all-java-files-under,api20) \
$(call all-java-files-under,api21) \
- $(call all-java-files-under,api23) \
- $(call all-java-files-under,api24) \
$(call all-java-files-under,java)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_SHARED_ANDROID_LIBRARIES := \