OSDN Git Service

Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev
authorJorim Jaggi <jjaggi@google.com>
Wed, 1 Jun 2016 18:50:23 +0000 (18:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Jun 2016 18:50:23 +0000 (18:50 +0000)
commit859465c105215cc7d0e152ad2280419c4f820598
tree5a6e714c4997526dc3e36dd427cdf10aae37e264
parent65436b097a9e513d8628ed3cfa187de226a75efb
parent13d534e7f2419219e3e26e582b1f6f5ae79be408
Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev
am: 13d534e7f2

* commit '13d534e7f2419219e3e26e582b1f6f5ae79be408':
  Don't crash activity manager when supplying invalid URI

Change-Id: I1f87d39822fe9a938b511a2b55fda2338311290e
services/core/java/com/android/server/am/ActivityManagerService.java