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

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

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

am: ef5c3aad

Change-Id: I311e10a4d9406539dfa7c540476b1bf86ebdad8c
parents 68d6fab1 ef5c3aad

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) {