Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Amith Yamasani
2017-05-11 19:17:07 +00:00
committed by Android (Google) Code Review
parent cad3c3251c b2926b1ddb
commit 33532e0208
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -1493,12 +1493,13 @@ public final class ActiveServices {
mAm.updateOomAdjLocked(r.binding.service.app, false); mAm.updateOomAdjLocked(r.binding.service.app, false);
} }
} }
mAm.updateOomAdjLocked();
} finally { } finally {
Binder.restoreCallingIdentity(origId); Binder.restoreCallingIdentity(origId);
} }
mAm.updateOomAdjLocked();
return true; return true;
} }