Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e869cba8 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

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

Merge \\\"Fixed whitelistManager set on unbindServiceLocked()\\\" into nyc-dev am: 8d78c33c am: ef5c3aad
am: cb9c52fd

Change-Id: I17e1697ced6f5c44e47f85245b637c82880e27d3
parents ddd8accb cb9c52fd

services/core/java/com/android/server/am/ActiveServices.java

+1 −3
Original line number Diff line number Diff line
@@ -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) {