fixed #2059: Fix complication errors on Android.
Merge pull request #2386 from dumganhar/master

fixed #2059: Fix complication errors on Android.