OSDN Git Service

Merge "Work on issue #36891897: Need to ensure foreground services can't..." into...
authorDianne Hackborn <hackbod@google.com>
Sun, 30 Apr 2017 17:34:21 +0000 (17:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 30 Apr 2017 17:34:21 +0000 (17:34 +0000)
commita766f1d1ec9d026843bf294ecfbed019a7aab48e
tree398817cf8f9eaed410ca7eda134b8e0b41cb3487
parent7acf27c9be542371c4bd5ac518c266bd2b390b6e
parentf1a4b507394f32a9a1fe83b5f6a9d5c543587a6c
Merge "Work on issue #36891897: Need to ensure foreground services can't..." into oc-dev
am: f1a4b50739

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