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

Commit e7e3c7ec authored by Howard Chen's avatar Howard Chen Committed by android-build-merger
Browse files

Merge "Remove blocking binder calls from isInUse method" 

am: 4bef5586

Change-Id: I2c4274c9c45e0a9347aa7791632e7ff3600edbf9
parents 7f70fe29 4bef5586

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