commit 58f2132bc3954fc704787d477500a209eedb8e29
author Ethan Yonker <dees_troy@teamw.in> Fri Aug 24 11:17:36 2018 -0500
committer Ethan Yonker <dees_troy@teamw.in> Fri Aug 24 11:17:39 2018 -0500
tree eb0f79aacd68724b0c0c091018384ef924380f47
parent 32aef7a2cf8ef3881e1efdce6cf693bc762cc604
parent 896de5423db1ec3824797e11199a08be20b02d1d

Merge AOSP android-9.0.0_r3

Fix conflicts and make it build in 5.1, 6.0, 7.1, 8.1, and 9.0

Change-Id: Ida0a64c29ff27d339b7f42a18d820930964ac6e4

gui/slidervalue.cpp

diff --git a/gui/slidervalue.cpp b/gui/slidervalue.cpp
index 6f007e2..3aaffcc 100644
--- a/gui/slidervalue.cpp
+++ b/gui/slidervalue.cpp
@@ -172,7 +172,10 @@
 		mSliderH = LoadAttrIntScaleY(child, "sliderh", mSliderH);
 	}
 
-	mFontHeight = mFont->GetHeight();
+	if (mFont && mFont->GetResource())
+		mFontHeight = mFont->GetHeight();
+	else
+		mFontHeight = 0;
 
 	if (mShowCurr)
 	{