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

2016-06-28 19:15:33 +00:00
parent a98e3e3ede a7778b0654
commit 8d78c33c9b
1 changed files with 1 additions and 3 deletions
--- 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) {