Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed whitelistManager set on unbindServiceLocked()" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-28 19:15:33 +00:00
committed by Android (Google) Code Review
parent a98e3e3ede a7778b0654
commit 8d78c33c9b
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -1148,9 +1148,7 @@ public final class ActiveServices {
if (r.binding.service.app != null) { if (r.binding.service.app != null) {
if (r.binding.service.app.whitelistManager) { if (r.binding.service.app.whitelistManager) {
// Must reset flag here because on computeOomAdjLocked() the service updateWhitelistManagerLocked(r.binding.service.app);
// connection will be gone...
r.binding.service.app.whitelistManager = false;
} }
// This could have made the service less important. // This could have made the service less important.
if ((r.flags&Context.BIND_TREAT_LIKE_ACTIVITY) != 0) { if ((r.flags&Context.BIND_TREAT_LIKE_ACTIVITY) != 0) {