OSDN Git Service

Merge "Silently ignore force stop API for protected packages" into pi-dev
authorBenjamin Franz <bfranz@google.com>
Fri, 13 Apr 2018 07:51:25 +0000 (00:51 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Apr 2018 07:51:25 +0000 (00:51 -0700)
commit83612737a18dcd7a48377d11c0a3ff870771fd03
treefd90ea11379da0a63be0ec3b215b2d8633e8f853
parent48b5b445b7fe18389e6b6c48eeab283b30baa8fd
parentdf88614db2c408a45518bd51a28705b542525c73
Merge "Silently ignore force stop API for protected packages" into pi-dev
am: df88614db2

Change-Id: I1490c123b60b05798584306af9c971a3411729cc
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/pm/PackageManagerService.java