diff options
| author | 2016-06-28 19:27:06 +0000 | |
|---|---|---|
| committer | 2016-06-28 19:27:06 +0000 | |
| commit | cb9c52fd80168577a1063a70986d0ebfc36fbc11 (patch) | |
| tree | 6c16c0809b468a2d2e5332ae81d888c28fd35b03 | |
| parent | 68d6fab1ab0e8ee925c19c4c0644fb4d8ffbe3c6 (diff) | |
| parent | ef5c3aad4df40913d62de4fd9b12e2c7a9bacdf5 (diff) | |
Merge \\"Fixed whitelistManager set on unbindServiceLocked()\\" into nyc-dev am: 8d78c33c9b
am: ef5c3aad4d
Change-Id: I311e10a4d9406539dfa7c540476b1bf86ebdad8c
| -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) { |