Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62893220 authored by Amith Yamasani's avatar Amith Yamasani Committed by android-build-merger
Browse files

Merge "Fix a security exception when unbinding services" into oc-dev am: 33532e02 

am: d07592f7

Change-Id: I632b14f0647010b5b8d46053696c45d2e17700c4
parents 98191800 d07592f7

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

+3 −2
Original line number Diff line number Diff line
@@ -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;

    }