diff options
| author | 2016-06-28 19:15:33 +0000 | |
|---|---|---|
| committer | 2016-06-28 19:15:34 +0000 | |
| commit | 8d78c33c9b27d06c258f2ed7613424e6cb3859ad (patch) | |
| tree | 1692658d012a506e7b56615e367f49198f43bd30 | |
| parent | a98e3e3ede66a3f93bdfd081cc0b336e723f7ee8 (diff) | |
| parent | a7778b065428af7f23605053f939a668dd297182 (diff) | |
Merge "Fixed whitelistManager set on unbindServiceLocked()" into nyc-dev
| -rwxr-xr-x | services/core/java/com/android/server/am/ActiveServices.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index d9148817881b..ee2fa51c8666 100755 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -1148,9 +1148,7 @@ public final class ActiveServices { if (r.binding.service.app != null) { if (r.binding.service.app.whitelistManager) { - // Must reset flag here because on computeOomAdjLocked() the service - // connection will be gone... - r.binding.service.app.whitelistManager = false; + updateWhitelistManagerLocked(r.binding.service.app); } // This could have made the service less important. if ((r.flags&Context.BIND_TREAT_LIKE_ACTIVITY) != 0) { |