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 
am: 33532e0208

Change-Id: Ia3a14b69f27106a6c7ca4a6625a0a103fb752c51
This commit is contained in:
Amith Yamasani
2017-05-11 19:42:46 +00:00
committed by android-build-merger
parent 33c786b80a 33532e0208
commit d07592f7a7
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;
} }