OSDN Git Service

Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev
authorFyodor Kupolov <fkupolov@google.com>
Fri, 27 May 2016 03:05:20 +0000 (03:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 03:05:20 +0000 (03:05 +0000)
commit5d531e4f6caedbcc2b6a9c7a549b83e37d694c7d
tree38b25dee3e4c043ea05424524938d067be83f636
parentb35e6f9ad7ddfc88bb9897746447f685304edb99
parenta4dbdaf5e96273dccd474e31700d84a1ad907503
Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev
am: a4dbdaf5e9

* commit 'a4dbdaf5e96273dccd474e31700d84a1ad907503':
  Remove ActivityManager calls with PM.mInstallLock held

Change-Id: I3be800fc5de9fa3c06f0bf6158a0dbf2a05b165e
core/java/android/os/UserManager.java
services/core/java/com/android/server/am/UserController.java
services/core/java/com/android/server/pm/UserManagerService.java