Some changes on Android code