Merge "Fix a security exception when unbinding services" into oc-dev

am: 33532e0208 Change-Id: Ia3a14b69f27106a6c7ca4a6625a0a103fb752c51
2017-05-11 19:42:46 +00:00
parent 33c786b80a 33532e0208
commit d07592f7a7
1 changed files with 3 additions and 2 deletions
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -1493,12 +1493,13 @@ public final class ActiveServices {
                    mAm.updateOomAdjLocked(r.binding.service.app, false);
                }
            }
+
+            mAm.updateOomAdjLocked();
+
        } finally {
            Binder.restoreCallingIdentity(origId);
        }

-        mAm.updateOomAdjLocked();
-
        return true;
    }