Merge changes I7907f0a3,Iec46c80b

* changes:
  When the mUri is null,it will happen NullPointerException.
  Ringtone uri should add type query