Merge change Ib8f16340 into eclair-mr2

* changes:
  Fix ConnectivityManager permissions check.