change to support android 10
rename parameter
fix bug about Space