whitelist added
merge
Android side