Fix a security exception when unbinding services

Clear calling identity before calling oom adjust. Bug: 38183641 Test: manual Change-Id: Ia3cc7bb83a94d1bb280a43912a250bddc9ef2c11
2017-05-11 11:13:52 -07:00
parent 1c38d29482
commit b2926b1ddb
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;
    }