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

Unverified Commit b4d18fa9 authored by Dark Eyes's avatar Dark Eyes Committed by Michael Bestas
Browse files

Fix unpinning on device with Navigation Bar 

The introduction of the long press back to kill option
messed with the stock behavior of the long press back
button to unpin the locked app. Fortunately, all the job
was already done for the no navigation bar case, so all I
did was to extend the same logic to the case where nav bar
is present.

Change-Id: I2921c653c6e9ce51d49bda31f6e9b64654aeaeaa
parent b9639041

services/core/java/com/android/server/policy/PhoneWindowManager.java

+7 −9
Original line number Original line Diff line number Diff line
@@ -3980,7 +3980,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }

    }





    private boolean unpinActivity(boolean checkOnly) {

    private boolean unpinActivity(boolean checkOnly) {

        if (!hasNavigationBar()) {

        try {

        try {

            if (ActivityManagerNative.getDefault().isInLockTaskMode()) {

            if (ActivityManagerNative.getDefault().isInLockTaskMode()) {

                if (!checkOnly) {

                if (!checkOnly) {
@@ -3991,7 +3990,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        } catch (RemoteException e) {

        } catch (RemoteException e) {

            // ignore

            // ignore

        }

        }

        }

        return false;

        return false;

    }

    }