OSDN Git Service

Merge "Fail gracefully if we get a bad API whitelist." into pi-dev
authorMathew Inwood <mathewi@google.com>
Thu, 19 Apr 2018 16:43:15 +0000 (09:43 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Apr 2018 16:43:15 +0000 (09:43 -0700)
commit96b2f3ce8bcc9fcd043fde771db7af5a0d15f1b6
tree158a294232ca66517088859b434702faf919a96f
parente4a5044b0f4c2eabdde80f242e7bf60494f27bc8
parent611443e98441783762e63e14b39fe8a7e01282fa
Merge "Fail gracefully if we get a bad API whitelist." into pi-dev
am: 611443e984

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