commit 33532e020873e580c421342e38b2352b836d30d4
author Amith Yamasani <yamasani@google.com> Thu May 11 19:17:07 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 11 19:17:13 2017 +0000
tree b0bd4a2f9e2aab12994f33c80e7c86f2ba481e37
parent cad3c3251c2850715fe52fe6ffc370e1090132a4
parent b2926b1ddb65c03bd417ba57121533fbf4286ee7

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

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

diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 1ed46a0..5e03508 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -1493,12 +1493,13 @@
                     mAm.updateOomAdjLocked(r.binding.service.app, false);
                 }
             }
+
+            mAm.updateOomAdjLocked();
+
         } finally {
             Binder.restoreCallingIdentity(origId);
         }
 
-        mAm.updateOomAdjLocked();
-
         return true;
     }