修改了隐私通信与情景模式间的逻辑。
Merge remote-tracking branch 'origin/master'

Conflicts:
	android_code/AndroidManifest.xml