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

Commit 944268b7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove blocking binder calls from isInUse method" am: 4bef5586 am: e7e3c7ec 

Change-Id: Ia36ad74c1f55932556bdd1a6e72e6835767159b7
parents a11a3618 e7e3c7ec

services/core/java/com/android/server/DynamicSystemService.java

+1 −12
Original line number Diff line number Diff line
@@ -179,18 +179,7 @@ public class DynamicSystemService extends IDynamicSystemService.Stub implements 


    @Override

    public boolean isInUse() throws RemoteException {

        boolean gsidWasRunning = "running".equals(SystemProperties.get("init.svc.gsid"));

        boolean isInUse = false;



        try {

            isInUse = getGsiService().isGsiRunning();

        } finally {

            if (!gsidWasRunning && !isInUse) {

                mGsiService = null;

            }

        }



        return isInUse;

        return SystemProperties.getBoolean("ro.gsid.image_running", false);

    }



    @Override